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

bug 1445120, cookie login not working on IIS

Browse Source
This commit is contained in:
Marc Delisle
2006-03-13 23:14:50 +00:00
parent 50dc7744ed
commit 30afc8d7b0
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2006-03-13 Marc Delisle <lem9@users.sourceforge.net>
* libraries/Config.class.php, /common.lib.php: bug #1445120,
cookie login not working on IIS
2006-03-10 Marc Delisle <lem9@users.sourceforge.net> 2006-03-10 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_tbl.lib.php: reactivate in-line image display * libraries/display_tbl.lib.php: reactivate in-line image display
* transformation_wrapper.php: bug #1444121, octetstream download fails * transformation_wrapper.php: bug #1444121, octetstream download fails

5
libraries/Config.class.php
View File

@@ -231,7 +231,10 @@ class PMA_Config
function checkWebServer() function checkWebServer()
{ {
if (getenv('SERVER_SOFTWARE') if (getenv('SERVER_SOFTWARE')
&& stristr(getenv('SERVER_SOFTWARE'), 'Microsoft/IIS')) { // some versions return Microsoft-IIS, some Microsoft/IIS
// we could use a preg_match() but it's slower
&& stristr(getenv('SERVER_SOFTWARE'), 'Microsoft')
&& stristr(getenv('SERVER_SOFTWARE'), 'IIS')) {
$this->set('PMA_IS_IIS', 1); $this->set('PMA_IS_IIS', 1);
} else { } else {
$this->set('PMA_IS_IIS', 0); $this->set('PMA_IS_IIS', 0);

7
libraries/common.lib.php
View File

@@ -1050,7 +1050,12 @@ if (!defined('PMA_MINIMUM_COMMON')) {
header('Location: ' . $uri . $separator . SID); header('Location: ' . $uri . $separator . SID);
} }
} else { } else {
header('Location: ' . $uri); session_write_close();
if (PMA_IS_IIS) {
header('Refresh: 0; ' . $uri);
} else {
header('Location: ' . $uri);
}
} }
} }
} }