diff --git a/ChangeLog b/ChangeLog index c2d6f662c..83b226e08 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2005-05-02 Marc Delisle + * export.php: bug #1123284, avoid double compression when + zlib.output_compression is On, thanks to unclef at users.sourceforge.net + 2005-05-01 Marc Delisle * server_status.php: bug #1193225, missing * tbl_properties.inc.php: bug #1193353, js error on creating table diff --git a/export.php b/export.php index 7997fd671..96440fe3e 100644 --- a/export.php +++ b/export.php @@ -248,9 +248,13 @@ if ($asfile) { $mime_type = 'application/x-bzip2'; } else if (isset($compression) && $compression == 'gzip') { $filename .= '.gz'; - // needed to avoid recompression by server modules like mod_gzip: - $content_encoding = 'x-gzip'; - $mime_type = 'application/x-gzip'; + // Needed to avoid recompression by server modules like mod_gzip. + // It seems necessary to check about zlib.output_compression + // to avoid compressing twice + if (!@ini_get('zlib.output_compression')) { + $content_encoding = 'x-gzip'; + $mime_type = 'application/x-gzip'; + } } else if (isset($compression) && $compression == 'zip') { $filename .= '.zip'; $mime_type = 'application/zip';