symfony
diff --git a/‎src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
+6-1Lines changed: 6 additions & 1 deletion b/‎src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
+6-1Lines changed: 6 additions & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
+15Lines changed: 15 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
+15Lines changed: 15 additions & 0 deletions
@@ -15,6 +15,7 @@
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -96,7 +97,11 @@ public function setRequest(Request $request = null)
     private function setCurrentRequest(Request $request = null)
     {
         if (null !== $request && $this->request !== $request) {
-            $this->context->fromRequest($request);
+            try {
+                $this->context->fromRequest($request);
+            } catch (\UnexpectedValueException $e) {
+                throw new BadRequestHttpException($e->getMessage(), $e, $e->getCode());
+            }
         }
 
         $this->request = $request;
 
@@ -155,4 +155,19 @@ public function getLoggingParameterData()
             array(array(), 'Matched route "n/a".'),
         );
     }
+
+    /**
+     * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
+     */
+    public function testSubRequestWithBadHost()
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $request = Request::create('http://bad host %22/');
+        $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
+
+        $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
+
+        $listener = new RouterListener($requestMatcher, new RequestContext(), null, $this->requestStack);
+        $listener->onKernelRequest($event);
+    }
 }