Merge branch 'refs/heads/clue-httphost'

This commit is contained in:
Chris Boden 2014-05-21 21:08:24 -04:00
commit 2085550826

View File

@ -107,7 +107,9 @@ class App {
$decorated = $controller;
}
$httpHost = $httpHost ?: $this->httpHost;
if ($httpHost === null) {
$httpHost = $this->httpHost;
}
$allowedOrigins = array_values($allowedOrigins);
if (0 === count($allowedOrigins)) {