Merge branch '2.1' into 2.2

fabpot · fabpot · commit 0de369ae38d0 · 2013-02-17T14:00:38.000+01:00
* 2.1: [FrameworkBundle] tweaked reference dumper command (see #7093) [HttpKernel] added some tests for previous merge Fix REMOTE_ADDR for cached subrequests [Process] Warn user with a useful message when tmpfile() failed Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -418,18 +418,6 @@ protected function fetch(Request $request, $catch = false)
         $subRequest->headers->remove('if_modified_since');
         $subRequest->headers->remove('if_none_match');
 
-        // modify the X-Forwarded-For header if needed
-        $forwardedFor = $subRequest->headers->get('X-Forwarded-For');
-        if ($forwardedFor) {
-            $subRequest->headers->set('X-Forwarded-For', $forwardedFor.', '.$subRequest->server->get('REMOTE_ADDR'));
-        } else {
-            $subRequest->headers->set('X-Forwarded-For', $subRequest->server->get('REMOTE_ADDR'));
-        }
-
-        // fix the client IP address by setting it to 127.0.0.1 as HttpCache
-        // is always called from the same process as the backend.
-        $subRequest->server->set('REMOTE_ADDR', '127.0.0.1');
-
         $response = $this->forward($subRequest, $catch);
 
         if ($this->isPrivateRequest($request) && !$response->headers->hasCacheControlDirective('public')) {
@@ -460,6 +448,18 @@ protected function forward(Request $request, $catch = false, Response $entry = n
             $this->esi->addSurrogateEsiCapability($request);
         }
 
+        // modify the X-Forwarded-For header if needed
+        $forwardedFor = $request->headers->get('X-Forwarded-For');
+        if ($forwardedFor) {
+            $request->headers->set('X-Forwarded-For', $forwardedFor.', '.$request->server->get('REMOTE_ADDR'));
+        } else {
+            $request->headers->set('X-Forwarded-For', $request->server->get('REMOTE_ADDR'));
+        }
+
+        // fix the client IP address by setting it to 127.0.0.1 as HttpCache
+        // is always called from the same process as the backend.
+        $request->server->set('REMOTE_ADDR', '127.0.0.1');
+
         // always a "master" request (as the real master request can be in cache)
         $response = $this->kernel->handle($request, HttpKernelInterface::MASTER_REQUEST, $catch);
         // FIXME: we probably need to also catch exceptions if raw === true
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
@@ -1066,4 +1066,13 @@ public function getXForwardedForData()
             array('10.0.0.2, 10.0.0.3', '10.0.0.2, 10.0.0.3, 10.0.0.1'),
         );
     }
+
+    public function testXForwarderForHeaderForPassRequests()
+    {
+        $this->setNextResponse();
+        $server = array('REMOTE_ADDR' => '10.0.0.1');
+        $this->request('POST', '/', $server);
+
+        $this->assertEquals('10.0.0.1', $this->kernel->getBackendRequest()->headers->get('X-Forwarded-For'));
+    }
 }
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -232,6 +232,9 @@ public function start($callback = null)
             $this->fileHandles = array(
                 self::STDOUT => tmpfile(),
             );
+            if (false === $this->fileHandles[self::STDOUT]) {
+                throw new RuntimeException('A temporary file could not be opened to write the process output to, verify that your TEMP environment variable is writable');
+            }
             $this->readBytes = array(
                 self::STDOUT => 0,
             );

Original file line number	Diff line number	Diff line change
`@@ -1066,4 +1066,13 @@ public function getXForwardedForData()`
`1066`	`1066`	`array('10.0.0.2, 10.0.0.3', '10.0.0.2, 10.0.0.3, 10.0.0.1'),`
`1067`	`1067`	`);`
`1068`	`1068`	`}`
	`1069`	`+`
	`1070`	`+ public function testXForwarderForHeaderForPassRequests()`
	`1071`	`+ {`
	`1072`	`+ $this->setNextResponse();`
	`1073`	`+ $server = array('REMOTE_ADDR' => '10.0.0.1');`
	`1074`	`+ $this->request('POST', '/', $server);`
	`1075`	`+`
	`1076`	`+ $this->assertEquals('10.0.0.1', $this->kernel->getBackendRequest()->headers->get('X-Forwarded-For'));`
	`1077`	`+ }`
`1069`	`1078`	`}`