nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1996943 [export] Firefox 3 and .sql.gz (corrupted)

Browse Source
This commit is contained in:
Marc Delisle
2008-06-19 12:29:48 +00:00
parent fdff4d6b71
commit be10c2988f
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -89,6 +89,7 @@ danbarry
- bug #1981043 [export] HTML in exports getting corrupted, - bug #1981043 [export] HTML in exports getting corrupted,
thanks to Jason Judge - jasonjudge thanks to Jason Judge - jasonjudge
- bug #1936761 [interface] BINARY not treated as BLOB: update/delete issues - bug #1936761 [interface] BINARY not treated as BLOB: update/delete issues
- bug #1996943 [export] Firefox 3 and .sql.gz (corrupted)
2.11.6.0 (2008-04-29) 2.11.6.0 (2008-04-29)
- bug #1903724 [interface] Displaying of very large queries in error message - bug #1903724 [interface] Displaying of very large queries in error message

6
export.php
View File

@@ -286,7 +286,11 @@ if ($asfile) {
// It seems necessary to check about zlib.output_compression // It seems necessary to check about zlib.output_compression
// to avoid compressing twice // to avoid compressing twice
if (!@ini_get('zlib.output_compression')) { if (!@ini_get('zlib.output_compression')) {
$content_encoding = 'x-gzip'; // On Firefox 3, sending this content encoding corrupts the .gz
// (as tested on Windows and Linux)
if (! (PMA_USR_BROWSER_AGENT == 'FIREFOX' && PMA_USR_BROWSER_VER >= '3.0')) {
$content_encoding = 'x-gzip';
}
$mime_type = 'application/x-gzip'; $mime_type = 'application/x-gzip';
} }
} elseif ($compression == 'zip') { } elseif ($compression == 'zip') {

3
libraries/Config.class.php
View File

@@ -178,6 +178,9 @@ class PMA_Config
&& preg_match('@Safari/([0-9]*)@', $HTTP_USER_AGENT, $log_version2)) { && preg_match('@Safari/([0-9]*)@', $HTTP_USER_AGENT, $log_version2)) {
$this->set('PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1]); $this->set('PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1]);
$this->set('PMA_USR_BROWSER_AGENT', 'SAFARI'); $this->set('PMA_USR_BROWSER_AGENT', 'SAFARI');
} elseif (preg_match('@Firefox(/| )([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version)) {
$this->set('PMA_USR_BROWSER_VER', $log_version[2]);
$this->set('PMA_USR_BROWSER_AGENT', 'FIREFOX');
} elseif (preg_match('@Mozilla/([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version)) { } elseif (preg_match('@Mozilla/([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version)) {
$this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_VER', $log_version[1]);
$this->set('PMA_USR_BROWSER_AGENT', 'MOZILLA'); $this->set('PMA_USR_BROWSER_AGENT', 'MOZILLA');