Changeset 29850

Timestamp:

10/08/2014 05:37:56 AM (12 years ago)

Author:

dd32

Message:

Correctly handle url's containing url's in WP_HTTP::make_absolute_url().
A valid relative URL could be mistaken for an absolute url if it contained a : in any position of the url.
Fixes #28001

Location:

trunk

Files:

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

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

@@ -676 +676 @@
                         return $maybe_relative_path;
 
-                // Check for a scheme.
-                if ( false !== strpos( $maybe_relative_path, '://' ) )
-                        return $maybe_relative_path;
-
                 if ( ! $url_parts = @parse_url( $url ) )
                         return $maybe_relative_path;
@@ -685 +681 @@
                 if ( ! $relative_url_parts = @parse_url( $maybe_relative_path ) )
                         return $maybe_relative_path;
+
+                // Check for a scheme on the 'relative' url
+                if ( ! empty( $relative_url_parts['scheme'] ) ) {
+                        return $maybe_relative_path;
+                }
 
                 $absolute_path = $url_parts['scheme'] . '://' . $url_parts['host'];

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

@@ -57 +57 @@
 
                         // A file with a leading dot
-                        array( '.ext', 'http://example.com/', 'http://example.com/.ext' )
+                        array( '.ext', 'http://example.com/', 'http://example.com/.ext' ),
+
+                        // URls within URLs
+                        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/' ),
                 );
         }