Merge pull request #1732 from codeigniter4/routefix2

Don't check from CLI in Routes. Fixes #1724
codeigniter4 · Feb 17, 2019 · 1d61fb2 · 1d61fb2
2 parents 0b6ebaa + 6ed11c4
commit 1d61fb2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -1250,7 +1250,7 @@ protected function create(string $verb, string $from, $to, array $options = null
 		if (! empty($options['hostname']))
 		{
 			// @todo determine if there's a way to whitelist hosts?
-			if (strtolower($_SERVER['HTTP_HOST']) !== strtolower($options['hostname']))
+			if (isset($_SERVER['HTTP_HOST']) && strtolower($_SERVER['HTTP_HOST']) !== strtolower($options['hostname']))
 			{
 				return;
 			}
@@ -1347,6 +1347,12 @@ protected function create(string $verb, string $from, $to, array $options = null
 	 */
 	private function checkSubdomains($subdomains)
 	{
+		// CLI calls can't be on subdomain.
+		if (! isset($_SERVER['HTTP_HOST']))
+		{
+			return false;
+		}
+
 		if (is_null($this->currentSubdomain))
 		{
 			$this->currentSubdomain = $this->determineCurrentSubdomain();