Fix extra trailing slash when forceGlobalSecureRequests is enabled

Author: michalsn

system/HTTP/URI.php

@@ -603,7 +603,7 @@ public static function createURIString(string $scheme = null, string $authority
 
 		if ($path !== '')
 		{
-			$uri .= substr($uri, -1, 1) !== '/' ? '/' . ltrim($path, '/') : $path;
+			$uri .= substr($uri, -1, 1) !== '/' ? '/' . ltrim($path, '/') : ltrim($path, '/');
 		}
 
 		if ($query)

tests/system/HTTP/URITest.php

@@ -155,7 +155,7 @@ public function testEmptyUri()
 		$this->assertEquals('http://' . $url, (string) $uri);
 		$url = '/';
 		$uri = new URI($url);
-		$this->assertEquals('http://' . $url, (string) $uri);
+		$this->assertEquals('http://', (string) $uri);
 	}
 
 	//--------------------------------------------------------------------
@@ -970,4 +970,12 @@ public function testSetURISilent()
 		$this->assertTrue(true);
 	}
 
+	public function testCreateURIString()
+	{
+		$expected = 'https://example.com/';
+		$uri      = URI::createURIString('https', 'example.com/', '/');
+
+		$this->assertEquals($expected, $uri);
+	}
+
 }