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

Variable name should be ForceSSL and not ForceSLL (bug #1374452).

Browse Source
This commit is contained in:
Michal Čihař
2005-12-06 15:38:10 +00:00
parent a3eff0682a
commit 055cd43009
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -10,6 +10,8 @@ $Source$
#1373891). #1373891).
* libraries/database_interface.lib.php: Do not add BINARY types multiple * libraries/database_interface.lib.php: Do not add BINARY types multiple
times (bug #1374457). times (bug #1374457).
* libraries/common.lib.php, libraries/config.default.php: Variable name
should be ForceSSL and not ForceSLL (bug #1374452).
2005-12-06 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-12-06 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/common.lib.php: wrong quote * libraries/common.lib.php: wrong quote

2
libraries/common.lib.php
View File

@@ -2674,7 +2674,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
/** /**
* check https connection * check https connection
*/ */
if ( $_SESSION['PMA_Config']->get( 'ForceSLL' ) if ( $_SESSION['PMA_Config']->get( 'ForceSSL' )
&& ! $_SESSION['PMA_Config']->get( 'is_https' ) ) { && ! $_SESSION['PMA_Config']->get( 'is_https' ) ) {
PMA_sendHeaderLocation( PMA_sendHeaderLocation(
preg_replace( '/^http/', 'https', preg_replace( '/^http/', 'https',

2
libraries/config.default.php
View File

@@ -123,7 +123,7 @@ $cfg['ServerDefault'] = 1; // Default server (0 = no default server
*/ */
$cfg['OBGzip'] = 'auto'; // use GZIP output buffering if possible (TRUE|FALSE|'auto') $cfg['OBGzip'] = 'auto'; // use GZIP output buffering if possible (TRUE|FALSE|'auto')
$cfg['PersistentConnections'] = FALSE; // use persistent connections to MySQL database $cfg['PersistentConnections'] = FALSE; // use persistent connections to MySQL database
$cfg['ForceSLL'] = FALSE; // whether to force using https $cfg['ForceSSL'] = FALSE; // whether to force using https
$cfg['ExecTimeLimit'] = 300; // maximum execution time in seconds (0 for no limit) $cfg['ExecTimeLimit'] = 300; // maximum execution time in seconds (0 for no limit)
$cfg['SkipLockedTables'] = FALSE; // mark used tables, make possible to show $cfg['SkipLockedTables'] = FALSE; // mark used tables, make possible to show
// locked tables (since MySQL 3.23.30) // locked tables (since MySQL 3.23.30)