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

improved fix for bug 1996943

Browse Source
This commit is contained in:
Marc Delisle
2008-06-20 17:53:30 +00:00
parent f221eabcc3
commit 62c8797bb5
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -33,8 +33,9 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- 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) - bug #1996943 [export] Firefox 3 and .sql.gz (corrupted); detect Gecko 1.9,
thanks to Jürgen Wind - windkiel
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
- bug #1905711 [compatibility] Functions deprecated in PHP 5.3: is_a() and - bug #1905711 [compatibility] Functions deprecated in PHP 5.3: is_a() and

4
export.php
View File

@@ -288,8 +288,8 @@ if ($asfile) {
// to avoid compressing twice // to avoid compressing twice
if (!@ini_get('zlib.output_compression')) { if (!@ini_get('zlib.output_compression')) {
// On Firefox 3, sending this content encoding corrupts the .gz // On Firefox 3, sending this content encoding corrupts the .gz
// (as tested on Windows and Linux) // (as tested on Windows and Linux) but detect GECKO 1.9
if (! (PMA_USR_BROWSER_AGENT == 'FIREFOX' && PMA_USR_BROWSER_VER >= '3.0')) { if (! (PMA_USR_BROWSER_AGENT == 'GECKO' && PMA_USR_BROWSER_VER == '1.9')) {
$content_encoding = 'x-gzip'; $content_encoding = 'x-gzip';
} }
$mime_type = 'application/x-gzip'; $mime_type = 'application/x-gzip';

6
libraries/Config.class.php
View File

@@ -178,9 +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)) { } elseif (preg_match('@rv:1.9(.*)Gecko@', $HTTP_USER_AGENT)) {
$this->set('PMA_USR_BROWSER_VER', $log_version[2]); $this->set('PMA_USR_BROWSER_VER', '1.9');
$this->set('PMA_USR_BROWSER_AGENT', 'FIREFOX'); $this->set('PMA_USR_BROWSER_AGENT', 'GECKO');
} 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');