From 055cd4300980951e6277fff861a6aea1828ff7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 6 Dec 2005 15:38:10 +0000 Subject: [PATCH] Variable name should be ForceSSL and not ForceSLL (bug #1374452). --- ChangeLog | 2 ++ libraries/common.lib.php | 2 +- libraries/config.default.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7c01d2fb5..a1959513de 100755 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ $Source$ #1373891). * libraries/database_interface.lib.php: Do not add BINARY types multiple 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 * libraries/common.lib.php: wrong quote diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 1d9d62e76e..42eaec68c8 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2674,7 +2674,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) { /** * check https connection */ - if ( $_SESSION['PMA_Config']->get( 'ForceSLL' ) + if ( $_SESSION['PMA_Config']->get( 'ForceSSL' ) && ! $_SESSION['PMA_Config']->get( 'is_https' ) ) { PMA_sendHeaderLocation( preg_replace( '/^http/', 'https', diff --git a/libraries/config.default.php b/libraries/config.default.php index a18a611408..c034ed1100 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -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['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['SkipLockedTables'] = FALSE; // mark used tables, make possible to show // locked tables (since MySQL 3.23.30)