ZF-9776

Corrected usage of $_SERVER['REDIRECT_QUERY_STRING'] in Zend_Controller


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@23987 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Controller/Request/Apache404.php

@@ -50,8 +50,8 @@ class Zend_Controller_Request_Apache404 extends Zend_Controller_Request_Http
                 $requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
             } elseif (isset($_SERVER['REDIRECT_URL'])) {  // Check if using mod_rewrite
                 $requestUri = $_SERVER['REDIRECT_URL'];
-                if (isset($_SERVER['REDIRECT_QUERYSTRING'])) {
-                    $parseUriGetVars = $_SERVER['REDIRECT_QUERYSTRING'];
+                if (isset($_SERVER['REDIRECT_QUERY_STRING'])) {
+                    $parseUriGetVars = $_SERVER['REDIRECT_QUERY_STRING'];
                 }
             } elseif (isset($_SERVER['REQUEST_URI'])) {
                 $requestUri = $_SERVER['REQUEST_URI'];

tests/Zend/Controller/Request/Apache404Test.php

@@ -83,11 +83,12 @@ class Zend_Controller_Request_Apache404Test extends PHPUnit_Framework_TestCase
 
     /**
      * @group ZF-3057
+     * @group ZF-9776
      */
     public function testRedirectQueryStringShouldBeParsedIntoGetVars()
     {
         $_SERVER['REDIRECT_URL']         = '/foo/bar';
-        $_SERVER['REDIRECT_QUERYSTRING'] = 'baz=bat&bat=delta';
+        $_SERVER['REDIRECT_QUERY_STRING'] = 'baz=bat&bat=delta';
         $_SERVER['REQUEST_URI']          = '/baz/bat';
 
         $request = new Zend_Controller_Request_Apache404();