bug #16274 [HttpKernel] Lookup the response even if the lock was released after two second wait (jakzal)

fabpot · fabpot · commit 8059dc1bab35 · 2016-01-25T13:21:38.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [HttpKernel] Lookup the response even if the lock was released after two second wait | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - While looking into #15813 I noticed that we [wait for the lock to be released for five seconds, but then only do a lookup if the lock was released in two seconds](https://github.com/symfony/symfony/blob/fa604d3c6f16f264863a42c200391ab996640296/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php#L540-L562), no more. I think it's worth to make both values the same (so either two or five seconds). I see no reason why we should wait for the lock for five seconds, but then only do a lookup if we waited for two. One way the wait either takes too long, the other way we loose the opportunity to actually return a response. Commits ------- 9963170 [HttpKernel] Lookup the response even if the lock was released after 2 seconds
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -544,7 +544,7 @@ protected function lock(Request $request, Response $entry)
                 $wait += 50000;
             }
 
-            if ($wait < 2000000) {
+            if ($wait < 5000000) {
                 // replace the current entry with the fresh one
                 $new = $this->lookup($request);
                 $entry->headers = $new->headers;

Original file line number	Diff line number	Diff line change
`@@ -544,7 +544,7 @@ protected function lock(Request $request, Response $entry)`
`544`	`544`	`$wait += 50000;`
`545`	`545`	`}`
`546`	`546`
`547`		`- if ($wait < 2000000) {`
	`547`	`+ if ($wait < 5000000) {`
`548`	`548`	`// replace the current entry with the fresh one`
`549`	`549`	`$new = $this->lookup($request);`
`550`	`550`	`$entry->headers = $new->headers;`