From 7c287fc06e90fd4f6fcd43398f52db924b695542 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 28 Dec 2008 14:50:07 +0000 Subject: [PATCH] bug #2397877 [core] ForceSSL and http auth_type --- ChangeLog | 1 + libraries/common.inc.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 094a812e8..47da114ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [lang] Czech update, thanks to Ondřej Vadinský. - bug #2461735 [operations] Table operations adds "row_format" - bug #2445213 [export] Commas for CSV Excel 2008 for Mac +- bug #2397877 [core] ForceSSL and http auth_type 3.1.1.0 (2008-12-09) - patch #2242765 [core] Navi panel server links wrong, diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 2d4c64775..cbcb5c5c4 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -540,6 +540,8 @@ if ($_SESSION['PMA_Config']->get('ForceSSL') preg_replace('/^http/', 'https', $_SESSION['PMA_Config']->get('PmaAbsoluteUri')) . PMA_generate_common_url($_GET, 'text')); + // delete the current session, otherwise we get problems (see bug #2397877) + PMA_removeCookie($GLOBALS['session_name']); exit; }