Changeset 29851

Timestamp:

10/08/2014 05:57:15 AM (11 years ago)

Author:

dd32

Message:

Correctly support Schemeless URLs in WP_HTTP::make_absolute_url() by respecting the 'host' field if present in the relative url.
Fixes #29886

Location:

trunk

Files:

• src/wp-includes/class-http.php (modified) (1 diff)
• tests/phpunit/tests/http/http.php (modified) (1 diff)

trunk/src/wp-includes/class-http.php

@@ -687 +687 @@
         }
 
-        $absolute_path = $url_parts['scheme'] . '://' . $url_parts['host'];
-        if ( isset( $url_parts['port'] ) )
-            $absolute_path .= ':' . $url_parts['port'];
+        $absolute_path = $url_parts['scheme'] . '://';
+
+        // Schemeless URL's will make it this far, so we check for a host in the relative url and convert it to a protocol-url
+        if ( isset( $relative_url_parts['host'] ) ) {
+            $absolute_path .= $relative_url_parts['host'];
+            if ( isset( $relative_url_parts['port'] ) )
+                $absolute_path .= ':' . $relative_url_parts['port'];
+        } else {
+            $absolute_path .= $url_parts['host'];
+            if ( isset( $url_parts['port'] ) )
+                $absolute_path .= ':' . $url_parts['port'];
+        }
 
         // Start off with the Absolute URL path.

trunk/tests/phpunit/tests/http/http.php

@@ -62 +62 @@
             array( '/expected', 'http://example.com/sub/http://site.com/sub/', 'http://example.com/expected' ),
             array( '/expected/http://site.com/sub/', 'http://example.com/', 'http://example.com/expected/http://site.com/sub/' ),
+
+            // Schemeless URL's (Not valid in HTTP Headers, but may be used elsewhere)
+            array( '//example.com/sub/', 'https://example.net', 'https://example.com/sub/' ),
         );
     }