Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

2013-08-09 12:21:16 +02:00 · 2013-08-09 12:21:16 +02:00 · 2fa35c9d60
commit 2fa35c9d60
parent b9d42e2793 5873c498e9
2 changed files with 1 additions and 5 deletions
--- a/1
+++ b/1
@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 - bug #4036 Call to undefined function mb_detect_encoding (clarify the doc)
 - bug Missing hints when changing a column's structure
 - bug #4048 Cannot select foreign value in Search
+- bug #4025 gzip export is not actually compressed with mod_deflate

 4.0.5.0 (2013-08-04)
 - bug #3977 Not detected configuration storage
--- a/export.php
+++ b/export.php
@ -268,11 +268,6 @@ function PMA_gzencodeNeeded()
 {
    if (@function_exists('gzencode')
        && ! @ini_get('zlib.output_compression')
-        // Here, we detect Apache's mod_deflate so we bet that
-        // this module is active for this instance of phpMyAdmin
-        // and therefore, will gzip encode the content
-        && ! (function_exists('apache_get_modules')
-            && in_array('mod_deflate', apache_get_modules()))
        && ! PMA_isGzHandlerEnabled()
    ) {
        return true;