force_https didn’t force https

colethorsen · colethorsen · commit 46098102bed8 · 2020-07-13T10:05:45.000-04:00
when https:// is present in a defined base URL and a user accesses the site on on an insecure protocol, it would not force them onto secure.
diff --git a/system/Common.php b/system/Common.php
@@ -447,13 +447,11 @@ function force_https(int $duration = 31536000, RequestInterface $request = null,
 
 		$baseURL = config(App::class)->baseURL;
 
-		// If we already use 'https' then return immediately
 		if (strpos($baseURL, 'https://') === 0)
 		{
-			return;
+			$baseURL = (string) substr($baseURL, strlen('https://'));
 		}
-
-		if (strpos($baseURL, 'http://') === 0)
+		else if (strpos($baseURL, 'http://') === 0)
 		{
 			$baseURL = (string) substr($baseURL, strlen('http://'));
 		}

Original file line number	Diff line number	Diff line change
`@@ -447,13 +447,11 @@ function force_https(int $duration = 31536000, RequestInterface $request = null,`
`447`	`447`
`448`	`448`	`$baseURL = config(App::class)->baseURL;`
`449`	`449`
`450`		`- // If we already use 'https' then return immediately`
`451`	`450`	`if (strpos($baseURL, 'https://') === 0)`
`452`	`451`	`{`
`453`		`- return;`
	`452`	`+ $baseURL = (string) substr($baseURL, strlen('https://'));`
`454`	`453`	`}`
`455`		`-`
`456`		`- if (strpos($baseURL, 'http://') === 0)`
	`454`	`+ else if (strpos($baseURL, 'http://') === 0)`
`457`	`455`	`{`
`458`	`456`	`$baseURL = (string) substr($baseURL, strlen('http://'));`
`459`	`457`	`}`