Merge branch '2.7' into 2.8

weaverryan · weaverryan · commit 164db858d94e · 2016-04-11T21:19:23.000-04:00
* 2.7:
  fix status code in snippet
diff --git a/book/http_cache.rst b/book/http_cache.rst
@@ -920,7 +920,7 @@ Here is how you can configure the Symfony reverse proxy to support the
             if ($this->getStore()->purge($request->getUri())) {
                 $response->setStatusCode(200, 'Purged');
             } else {
-                $response->setStatusCode(200, 'Not found');
+                $response->setStatusCode(404, 'Not found');
             }
 
             return $response;

Original file line number	Diff line number	Diff line change
`@@ -920,7 +920,7 @@ Here is how you can configure the Symfony reverse proxy to support the`
`920`	`920`	`if ($this->getStore()->purge($request->getUri())) {`
`921`	`921`	`$response->setStatusCode(200, 'Purged');`
`922`	`922`	`} else {`
`923`		`- $response->setStatusCode(200, 'Not found');`
	`923`	`+ $response->setStatusCode(404, 'Not found');`
`924`	`924`	`}`
`925`	`925`
`926`	`926`	`return $response;`