Changeset 29850 for trunk/src/wp-includes/class-http.php

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

File:

• trunk/src/wp-includes/class-http.php (modified) (2 diffs)

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'];