From c3f7496a7fd9bd13eff54ebb4544bf9ae20e42b9 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 13 Dec 2007 18:48:53 +0000
Subject: [PATCH] bug #1817612 [cookies] Wrong cookie path on IIS with PHP-CGI

---
 ChangeLog                  | 2 ++
 libraries/Config.class.php | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ad2bc820b..b42834ab0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1843463 [GUI] DROP PROCEDURE does not show alert
 - bug #1835904 [GUI] Back link after a SQL error forgets the query
 - 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)
 - patch #1818389 to remove a notice (failed to flush buffer), thanks to
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 643caf61f..62e438c40 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -862,15 +862,13 @@ class PMA_Config
 
         // If we don't have path
         if (empty($url)) {
-            //if (PMA_getenv('PATH_INFO')) {
-            //    $url = PMA_getenv('PATH_INFO');
-            //} else
             if ($GLOBALS['PMA_PHP_SELF']) {
                 // PHP_SELF in CGI often points to cgi executable, so use it
                 // as last choice
                 $url = $GLOBALS['PMA_PHP_SELF'];
+            // on IIS with PHP-CGI:
             } elseif (PMA_getenv('SCRIPT_NAME')) {
-                $url = $GLOBALS['PMA_PHP_SELF'];
+                $url = PMA_getenv('SCRIPT_NAME');
             }
         }