Route, SimpleRouter: by default keeps the currently used HTTP/HTTPS protocol (BC break) [Closes nette/nette#1196][Closes nette/routing#14]

Author: dg

src/Application/Routers/Route.php

@@ -385,7 +385,7 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 
 		if ($this->type !== self::HOST) {
 			if ($this->lastRefUrl !== $refUrl) {
-				$scheme = ($this->flags & self::SECURED ? 'https://' : 'http://');
+				$scheme = ($this->flags & self::SECURED ? 'https://' : $refUrl->getScheme() . '://');
 				$basePath = ($this->type === self::RELATIVE ? $refUrl->getBasePath() : '');
 				$this->lastBaseUrl = $scheme . $refUrl->getAuthority() . $basePath;
 				$this->lastRefUrl = $refUrl;
@@ -401,7 +401,7 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 				'%domain%' => isset($host[1]) ? "$host[1].$host[0]" : $host[0],
 				'%sld%' => isset($host[1]) ? $host[1] : '',
 			]);
-			$url = ($this->flags & self::SECURED ? 'https:' : 'http:') . $url;
+			$url = ($this->flags & self::SECURED ? 'https:' : $refUrl->getScheme() . ':') . $url;
 		}
 
 		if (strpos($url, '//', 7) !== FALSE) {

src/Application/Routers/SimpleRouter.php

@@ -115,7 +115,7 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 			}
 		}
 
-		$url = ($this->flags & self::SECURED ? 'https://' : 'http://') . $refUrl->getAuthority() . $refUrl->getPath();
+		$url = ($this->flags & self::SECURED ? 'https://' : $refUrl->getScheme() . '://') . $refUrl->getAuthority() . $refUrl->getPath();
 		$sep = ini_get('arg_separator.input');
 		$query = http_build_query($params, '', $sep ? $sep[0] : '&');
 		if ($query != '') { // intentionally ==

tests/Routers/Route.basic.phpt

@@ -69,4 +69,4 @@ testRouteIn($route, '/presenter', 'Presenter', [
 	'id' => '',
 	'action' => 'default',
 	'test' => 'testvalue',
-], '/presenter/?test=testvalue', TRUE);
+], 'https://example.com/presenter/?test=testvalue', TRUE);

tests/Routers/Route.withAbsolutePath.phpt

@@ -28,4 +28,4 @@ testRouteIn($route, '/abc', 'Default', [
 	'abspath' => 'abc',
 	'action' => 'default',
 	'test' => 'testvalue',
-], '/abc/?test=testvalue', TRUE);
+], 'https://example.com/abc/?test=testvalue', TRUE);

tests/Routers/Route.withHost.phpt

@@ -32,4 +32,4 @@ testRouteIn($route, '/abc', 'Default', [
 	'path' => 'abc',
 	'action' => 'default',
 	'test' => 'testvalue',
-], '/abc?test=testvalue', TRUE);
+], 'https://example.com/abc?test=testvalue', TRUE);

tests/Routers/SimpleRouter.phpt

@@ -40,4 +40,4 @@ Assert::same('http://nette.org/file.php?action=action&test=testvalue&presenter=m
 
 $url = new Http\UrlScript('https://nette.org/file.php');
 $res = $router->constructUrl($req, $url);
-Assert::same('http://nette.org/file.php?action=action&test=testvalue&presenter=myPresenter', $res);
+Assert::same('https://nette.org/file.php?action=action&test=testvalue&presenter=myPresenter', $res);