Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

bug #3840 When exporting to gzip format, the data is compressed 2 times

  • Loading branch information...
commit 30b4fda252ede7cdaa4b6b997438ed11e26ff2aa 1 parent 81b94eb
Gemorroj authored
Showing with 17 additions and 0 deletions.
  1. +1 −0  ChangeLog
  2. +16 −0 export.php
1  ChangeLog
View
@@ -97,6 +97,7 @@ underscore
- bug #3829 Enabling query profiling crashes javascript based navigation
+ rfe #879 Reserved word warning
+ Remove the database ordering sub-feature of the only_db directive
+bug #3840 When exporting to gzip format, the data is compressed 2 times
3.5.8.0 (not yet released)
- bug #3828 MariaDB reported as MySQL
16 export.php
View
@@ -137,6 +137,20 @@
// We send fake headers to avoid browser timeout when buffering
$time_start = time();
+
+/**
+ * Disable all handlers
+ *
+ * @return bool
+ */
+function PMA_handlersDisable()
+{
+ while (ob_get_level() > 0) {
+ ob_end_clean();
+ }
+ return true;
+}
+
/**
* Detect whether gzencode is needed; it might not be needed if
* the server is already compressing by itself
@@ -158,6 +172,7 @@ function PMA_gzencodeNeeded()
return false;
}
}
+
/**
* Output handler for all exports, if needed buffering, it stores data into
* $dump_buffer, otherwise it prints thems out.
@@ -823,6 +838,7 @@ function PMA_exportOutputHandler($line)
}
exit();
} else {
+ PMA_handlersDisable();
PMA_Response::getInstance()->disable();
echo $dump_buffer;
}
Please sign in to comment.
Something went wrong with that request. Please try again.