From fe245e197aaad55f01c4935d675cb90e29c79672 Mon Sep 17 00:00:00 2001
From: Cornel Les <cornel.les@softvision.ro>
Date: Tue, 9 Apr 2013 18:40:51 +0300
Subject: [PATCH] [HttpFoundation] Fixed problem with Request::getBaseUrl

---
 src/Symfony/Component/HttpFoundation/Request.php       |  2 +-
 .../Component/HttpFoundation/Tests/RequestTest.php     | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 6da6bc87edd9f..a2ccbe10b873b 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1521,7 +1521,7 @@ protected function prepareBaseUrl()
         }
 
         $basename = basename($baseUrl);
-        if (empty($basename) || !strpos(rawurldecode($truncatedRequestUri), $basename)) {
+        if (empty($basename) || !strpos(rawurldecode($truncatedRequestUri), $baseUrl)) {
             // no match whatsoever; set it blank
             return '';
         }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
index 38ae748da6a9f..82fe7f2fced26 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -1130,6 +1130,16 @@ public function getBaseUrlData()
                 '/foo',
                 '/bar+baz',
             ),
+            array(
+                '/foobar/index.php',
+                array(
+                    'SCRIPT_FILENAME' => '/foo/bar/web/index.php',
+                    'SCRIPT_NAME'     => '/web/index.php',
+                    'PHP_SELF'        => '/web/index.php',
+                ),
+                '',            //getBaseUrl    Fails, '/web/index.php' returned
+                '/foobar/index.php',  //getPathInfo   Fails, 'php' returned
+            )
         );
     }