$cfg['OBGzip'] = 'auto' created and set to default.

This commit is contained in:
Garvin Hicking
2003-07-09 09:02:41 +00:00
parent 8e13b6923d
commit e505c393f0
6 changed files with 25 additions and 4 deletions

View File

@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
$Id$
$Source$
2003-07-09 Garvin Hicking <me@supergarv.de>
* Documentation.html, config.inc.php3, libraries/common.lib.php3,
libraries/config_import.lib.php3, header.inc.php3: Created auto-detection
for $cfg['OBGzip'] and set this as default. It will auto-enable OBGzip
for all browsers except IE6.x. Created a meta-header to identify which
setting is used, to make our debugging of bugreports easier.
2003-07-08 Garvin Hicking <me@supergarv.de>
* tbl_query_box.php3, footer.inc.php3: Removed any 'top.' DOM reference.
This enables phpMyAdmin to be used within a frameset without trying

View File

@@ -995,10 +995,14 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
<br /><br />
</dd>
<dt><b>$cfg['OBGzip'] </b>boolean</dt>
<dt><b>$cfg['OBGzip'] </b>string/boolean</dt>
<dd>
Defines whether to use GZip output buffering for increased
speed in HTTP transfers.
speed in HTTP transfers.<br />
Set to true/false for enabling/disabling. When set to 'auto' (string),
phpMyAdmin tries to enable output buffering and will automatically disable
it, if your browser has some problems with buffering. IE6 with a certain patch
is known to cause data corruption having enabled buffering.
<br /><br />
</dd>

View File

@@ -188,7 +188,7 @@ unset($cfg['Servers'][0]);
/**
* Other core phpMyAdmin settings
*/
$cfg['OBGzip'] = TRUE; // use GZIP output buffering if possible
$cfg['OBGzip'] = 'auto'; // use GZIP output buffering if possible (TRUE|FALSE|'auto')
$cfg['PersistentConnections'] = FALSE; // use persistent connections to MySQL database
$cfg['ExecTimeLimit'] = 300; // maximum execution time in seconds (0 for no limit)
$cfg['SkipLockedTables'] = FALSE; // mark used tables, make possible to show

View File

@@ -111,6 +111,7 @@ var errorMsg2 = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strNotValidNum
}
echo "\n";
?>
<meta name="OBGZip" value="<?php echo ($cfg['OBGzip'] ? 'true' : 'false'); ?>" />
</head>

View File

@@ -240,6 +240,15 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
|| (PMA_PHP_INT_VERSION >= 40005 && @ini_get('zlib.output_compression'))) {
$cfg['OBGzip'] = FALSE;
}
// disable output-buffering (if set to 'auto') for IE6, else enable it.
if (strtolower($cfg['OBGzip']) == 'auto') {
if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER < 7) {
$cfg['OBGzip'] = FALSE;
} else {
$cfg['OBGzip'] = TRUE;
}
}
if ($is_minimum_common == FALSE) {
/**

View File

@@ -206,7 +206,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
$cfg['OBGzip'] = $cfgOBGzip;
unset($cfgOBGzip);
} else {
$cfg['OBGzip'] = TRUE;
$cfg['OBGzip'] = 'auto';
}
}