nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch #2773818 [export] Invalid "Content-Encoding" header

Browse Source
This commit is contained in:
Marc Delisle
2009-05-03 17:03:47 +00:00
parent c848bd0e47
commit 0214a6fe9d
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -64,6 +64,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2780722 [import] Incorrect maximum file size - bug #2780722 [import] Incorrect maximum file size
- bug #2780356 [calendar] Null checkbox not unchecked when date is chosen - bug #2780356 [calendar] Null checkbox not unchecked when date is chosen
- bug [calendar] js error "window.parent.addEvent is not a function" - bug [calendar] js error "window.parent.addEvent is not a function"
- patch #2773818 [export] Invalid "Content-Encoding" header,
thanks to abignale - abignale
3.1.4.0 (2009-04-25) 3.1.4.0 (2009-04-25)
+ patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ, + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,

22
export.php
View File

@@ -272,27 +272,14 @@ if ($asfile) {
$filename .= '.' . $export_list[$type]['extension']; $filename .= '.' . $export_list[$type]['extension'];
$mime_type = $export_list[$type]['mime_type']; $mime_type = $export_list[$type]['mime_type'];
// If dump is going to be compressed, set correct encoding or mime_type and add // If dump is going to be compressed, set correct mime_type and add
// compression to extension // compression to extension
$content_encoding = '';
if ($compression == 'bzip') { if ($compression == 'bzip') {
$filename .= '.bz2'; $filename .= '.bz2';
// browsers don't like this:
//$content_encoding = 'x-bzip2';
$mime_type = 'application/x-bzip2'; $mime_type = 'application/x-bzip2';
} elseif ($compression == 'gzip') { } elseif ($compression == 'gzip') {
$filename .= '.gz'; $filename .= '.gz';
// Needed to avoid recompression by server modules like mod_gzip. $mime_type = 'application/x-gzip';
// It seems necessary to check about zlib.output_compression
// to avoid compressing twice
if (!@ini_get('zlib.output_compression')) {
// On Firefox 3, sending this content encoding corrupts the .gz
// (as tested on Windows and Linux) but detect GECKO 1.9
if (! (PMA_USR_BROWSER_AGENT == 'GECKO' && PMA_USR_BROWSER_VER == '1.9')) {
$content_encoding = 'x-gzip';
}
$mime_type = 'application/x-gzip';
}
} elseif ($compression == 'zip') { } elseif ($compression == 'zip') {
$filename .= '.zip'; $filename .= '.zip';
$mime_type = 'application/zip'; $mime_type = 'application/zip';
@@ -345,9 +332,6 @@ if (!$save_on_server) {
// this was reported to happen under Plesk) // this was reported to happen under Plesk)
@ini_set('url_rewriter.tags',''); @ini_set('url_rewriter.tags','');
if (!empty($content_encoding)) {
header('Content-Encoding: ' . $content_encoding);
}
header('Content-Type: ' . $mime_type); header('Content-Type: ' . $mime_type);
header('Expires: ' . gmdate('D, d M Y H:i:s') . ' GMT'); header('Expires: ' . gmdate('D, d M Y H:i:s') . ' GMT');
// lem9: Tested behavior of // lem9: Tested behavior of
@@ -605,7 +589,7 @@ if (!empty($asfile)) {
} }
// 3. as a gzipped file // 3. as a gzipped file
elseif ($compression == 'gzip') { elseif ($compression == 'gzip') {
if (@function_exists('gzencode')) { if (@function_exists('gzencode') && !@ini_get('zlib.output_compression')) {
// without the optional parameter level because it bug // without the optional parameter level because it bug
$dump_buffer = gzencode($dump_buffer); $dump_buffer = gzencode($dump_buffer);
} }