merged 2.0

symfony · Mar 22, 2012 · 1dcb71f · 1dcb71f
2 parents 7dfcbe4 + 0cb0faf
commit 1dcb71f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/EventListener/ExceptionListener.php b/EventListener/ExceptionListener.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);

diff --git a/HttpCache/HttpCache.php b/HttpCache/HttpCache.php
@@ -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) {