bug #1817612 [cookies] Wrong cookie path on IIS with PHP-CGI

This commit is contained in:
Marc Delisle
2007-12-13 18:48:53 +00:00
parent bb70f2d7b6
commit c3f7496a7f
2 changed files with 4 additions and 4 deletions

View File

@@ -31,6 +31,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1843463 [GUI] DROP PROCEDURE does not show alert - bug #1843463 [GUI] DROP PROCEDURE does not show alert
- bug #1835904 [GUI] Back link after a SQL error forgets the query - bug #1835904 [GUI] Back link after a SQL error forgets the query
- bug #1835654 [core] wrong escaping when using double quotes - bug #1835654 [core] wrong escaping when using double quotes
- bug #1817612 [cookies] Wrong cookie path on IIS with PHP-CGI,
thanks to Carsten Wiedmann
2.11.3.0 (2007-12-08) 2.11.3.0 (2007-12-08)
- patch #1818389 to remove a notice (failed to flush buffer), thanks to - patch #1818389 to remove a notice (failed to flush buffer), thanks to

View File

@@ -862,15 +862,13 @@ class PMA_Config
// If we don't have path // If we don't have path
if (empty($url)) { if (empty($url)) {
//if (PMA_getenv('PATH_INFO')) {
// $url = PMA_getenv('PATH_INFO');
//} else
if ($GLOBALS['PMA_PHP_SELF']) { if ($GLOBALS['PMA_PHP_SELF']) {
// PHP_SELF in CGI often points to cgi executable, so use it // PHP_SELF in CGI often points to cgi executable, so use it
// as last choice // as last choice
$url = $GLOBALS['PMA_PHP_SELF']; $url = $GLOBALS['PMA_PHP_SELF'];
// on IIS with PHP-CGI:
} elseif (PMA_getenv('SCRIPT_NAME')) { } elseif (PMA_getenv('SCRIPT_NAME')) {
$url = $GLOBALS['PMA_PHP_SELF']; $url = PMA_getenv('SCRIPT_NAME');
} }
} }