Permalink
Browse files

merged 2.0

  • Loading branch information...
2 parents 7dfcbe4 + 0cb0faf commit 1dcb71f0d8d9b2dae9958088addb9566a3355461 @fabpot fabpot committed Mar 22, 2012
Showing with 3 additions and 1 deletion.
  1. +1 −0 EventListener/ExceptionListener.php
  2. +2 −1 HttpCache/HttpCache.php
@@ -76,6 +76,7 @@ public function onKernelException(GetResponseForExceptionEvent $event)
);
$request = $request->duplicate(null, null, $attributes);
+ $request->setMethod('GET');
try {
$response = $event->getKernel()->handle($request, HttpKernelInterface::SUB_REQUEST, true);
@@ -516,7 +516,8 @@ protected function lock(Request $request, Response $entry)
// wait for the lock to be released
$wait = 0;
while (is_file($lock) && $wait < 5000000) {
- usleep($wait += 50000);
+ usleep(50000);
+ $wait += 50000;
}
if ($wait < 2000000) {

0 comments on commit 1dcb71f

Please sign in to comment.