Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

bug #3563824 [export] Support Apache mod_deflate

  • Loading branch information...
commit dc969a9ae507d3cebc4f2466913e3f64228e50a6 1 parent c1f4c8f
@lem9 lem9 authored
Showing with 9 additions and 1 deletion.
  1. +1 −0  ChangeLog
  2. +8 −1 export.php
View
1  ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
3.5.5.0 (not yet released)
+- bug #3563824 [export] Support Apache's mod_deflate
3.5.4.0 (not yet released)
- bug #3570212 [edit] uuid_short() is a no-arguments function
View
9 export.php
@@ -638,7 +638,14 @@ function PMA_exportOutputHandler($line)
}
} elseif ($compression == 'gzip') {
// 3. as a gzipped file
- if (@function_exists('gzencode') && !@ini_get('zlib.output_compression')) {
+ 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()))
+ ) {
// without the optional parameter level because it bug
$dump_buffer = gzencode($dump_buffer);
}
Please sign in to comment.
Something went wrong with that request. Please try again.