bug #10502 [HttpKernel] Fix #10437: Catch exceptions when reloading a no-cache request (romainneutron)

fabpot · fabpot · commit 16434b561115 · 2014-03-26T08:25:06.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [HttpKernel] Fix #10437: Catch exceptions when reloading a no-cache request | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #10437 | License | MIT Commits ------- 8e3a395 Fix #10437: Catch exceptions when reloading a no-cache request
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -308,7 +308,7 @@ protected function lookup(Request $request, $catch = false)
         if ($this->options['allow_reload'] && $request->isNoCache()) {
             $this->record($request, 'reload');
 
-            return $this->fetch($request);
+            return $this->fetch($request, $catch);
         }
 
         try {
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
@@ -934,6 +934,17 @@ public function testShouldCatchExceptions()
         $this->assertExceptionsAreCaught();
     }
 
+    public function testShouldCatchExceptionsWhenReloadingAndNoCacheRequest()
+    {
+        $this->catchExceptions();
+
+        $this->setNextResponse();
+        $this->cacheConfig['allow_reload'] = true;
+        $this->request('GET', '/', array(), array(), false, array('Pragma' => 'no-cache'));
+
+        $this->assertExceptionsAreCaught();
+    }
+
     public function testShouldNotCatchExceptions()
     {
         $this->catchExceptions(false);
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php
@@ -107,7 +107,7 @@ public function assertExceptionsAreNotCaught()
         $this->assertFalse($this->kernel->isCatchingExceptions());
     }
 
-    public function request($method, $uri = '/', $server = array(), $cookies = array(), $esi = false)
+    public function request($method, $uri = '/', $server = array(), $cookies = array(), $esi = false, $headers = array())
     {
         if (null === $this->kernel) {
             throw new \LogicException('You must call setNextResponse() before calling request().');
@@ -122,6 +122,7 @@ public function request($method, $uri = '/', $server = array(), $cookies = array
         $this->esi = $esi ? new Esi() : null;
         $this->cache = new HttpCache($this->kernel, $this->store, $this->esi, $this->cacheConfig);
         $this->request = Request::create($uri, $method, array(), $cookies, array(), $server);
+        $this->request->headers->add($headers);
 
         $this->response = $this->cache->handle($this->request, HttpKernelInterface::MASTER_REQUEST, $this->catch);
 

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ protected function lookup(Request $request, $catch = false)`
`308`	`308`	`if ($this->options['allow_reload'] && $request->isNoCache()) {`
`309`	`309`	`$this->record($request, 'reload');`
`310`	`310`
`311`		`- return $this->fetch($request);`
	`311`	`+ return $this->fetch($request, $catch);`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function assertExceptionsAreNotCaught()`
`107`	`107`	`$this->assertFalse($this->kernel->isCatchingExceptions());`
`108`	`108`	`}`
`109`	`109`
`110`		`- public function request($method, $uri = '/', $server = array(), $cookies = array(), $esi = false)`
	`110`	`+ public function request($method, $uri = '/', $server = array(), $cookies = array(), $esi = false, $headers = array())`
`111`	`111`	`{`
`112`	`112`	`if (null === $this->kernel) {`
`113`	`113`	`throw new \LogicException('You must call setNextResponse() before calling request().');`
`@@ -122,6 +122,7 @@ public function request($method, $uri = '/', $server = array(), $cookies = array`
`122`	`122`	`$this->esi = $esi ? new Esi() : null;`
`123`	`123`	`$this->cache = new HttpCache($this->kernel, $this->store, $this->esi, $this->cacheConfig);`
`124`	`124`	`$this->request = Request::create($uri, $method, array(), $cookies, array(), $server);`
	`125`	`+ $this->request->headers->add($headers);`
`125`	`126`
`126`	`127`	`$this->response = $this->cache->handle($this->request, HttpKernelInterface::MASTER_REQUEST, $this->catch);`
`127`	`128`