Improve gzip export ratio (bug #387)

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index cd4204665dfa2cd977675c2629d5889b10d17a14..500f56d43de486cf1d90dfbf26b65ee4416d0173 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -740,7 +740,7 @@ username.form['auth[driver]'].onchange();
                        ($ext == "sql" || $output != "file" ? "text/plain" : "text/csv") . "; charset=utf-8"
                )));
                if ($output == "gz") {
-                       ob_start('gzencode', 1e6);
+                       ob_start('ob_gzencode', 1e6);
                }
                return $ext;
        }

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index ad9e8dd3d83691ce234d9ef2c56b631078f8b8be..b5d7024c0e2bbd8dbd084d5c83b3c48a97d745d6 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -496,3 +496,12 @@ function doc_link($paths) {
        );
        return ($paths[$jush] ? "<a href='$urls[$jush]$paths[$jush]' target='_blank' rel='noreferrer'><sup>?</sup></a>" : "");
 }
+
+/** Wrap gzencode() for usage in ob_start()
+* @param string
+* @return string
+*/
+function ob_gzencode($string) {
+       // ob_start() callback recieves an optional parameter $phase but gzencode() accepts optional parameter $level
+       return gzencode($string);
+}

diff --git a/changes.txt b/changes.txt
index e995e4eee024000e80542fd195368225bd20040d..0ee725e455017755ee719b68a83f159d7f9c88d5 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 4.0.4-dev:
+Improve gzip export ratio (bug #387)
 MySQL: Respect daylight saving time in dump, bug since Adminer 3.6.4
 SQLite: Display auto-created unique indexes, bug since Adminer 3.5.0
 Editor: Fix login() method, bug since Adminer 4.0.0