Fixed #735 - Endless Loop for URLs without servlet name

appserver-io · Apr 8, 2015 · 366b4b8 · 366b4b8
1 parent a49692b
commit 366b4b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Bugfixes
 
+* Fixed [#735](https://github.com/appserver-io/appserver/issues/735) - Endless Loop for URLs without servlet name
 * Fixed [#719](https://github.com/appserver-io/appserver/issues/719) - Around advice chain does break at certain size
 * Fixed [#721](https://github.com/appserver-io/appserver/issues/721) - Different order of Advices in pointcut.xml depending on type
 

diff --git a/src/AppserverIo/Appserver/ServletEngine/Http/Request.php b/src/AppserverIo/Appserver/ServletEngine/Http/Request.php
@@ -255,9 +255,11 @@ public function prepare()
         // set the context path
         $this->setContextPath($contextPath);
 
-        // load the request URI and query string
-        $uri = $this->getUri();
-        $queryString = $this->getQueryString();
+        // Fixed #735 - Endless Loop for URLs without servlet name
+        // Load the request URI and query string from the server vars, because we have to
+        // take care about changes from other modules like directory or rewrite module!
+        $uri = $this->getServerVar(ServerVars::X_REQUEST_URI);
+        $queryString = $this->getServerVar(ServerVars::QUERY_STRING);
 
         // get uri without querystring
         $uriWithoutQueryString = str_replace('?' . $queryString, '', $uri);