Commit 05e1a61d authored by webchick's avatar webchick
Browse files

Issue #2150623 by dawehner, pwolanin, rfay: Subdirectory + Clean URLs failure:...

Issue #2150623 by dawehner, pwolanin, rfay: Subdirectory + Clean URLs failure: 6.x-3.x PIFR: 3 Failures in D8 test.
parent 560e5afd
...@@ -295,7 +295,7 @@ function simpletest_script_init($server_software) { ...@@ -295,7 +295,7 @@ function simpletest_script_init($server_software) {
if (!empty($args['url'])) { if (!empty($args['url'])) {
$parsed_url = parse_url($args['url']); $parsed_url = parse_url($args['url']);
$host = $parsed_url['host'] . (isset($parsed_url['port']) ? ':' . $parsed_url['port'] : ''); $host = $parsed_url['host'] . (isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '');
$path = isset($parsed_url['path']) ? rtrim($parsed_url['path']) : ''; $path = isset($parsed_url['path']) ? rtrim(rtrim($parsed_url['path']), '/') : '';
$port = (isset($parsed_url['port']) ? $parsed_url['port'] : $port); $port = (isset($parsed_url['port']) ? $parsed_url['port'] : $port);
if ($path == '/') { if ($path == '/') {
$path = ''; $path = '';
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment