Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-28 23:27:39 +02:00
Code Issues Projects Releases Wiki Activity

HTTP API: Revert changes to wp_parse_url() while PHP 5.2 errors are investigated.

Browse Source 
See #36356

Built from https://develop.svn.wordpress.org/trunk@38456


git-svn-id: http://core.svn.wordpress.org/trunk@38397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2016-08-31 00:24:31 +00:00
parent 5d94d97b29
commit 049c36d11f
2 changed files with 18 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
wp-includes/http.php
View File

@ -633,65 +633,35 @@ function ms_allowed_http_request_hosts( $is_external, $host ) {
* when URL parsing failed. * when URL parsing failed.
* *
* @since 4.4.0 * @since 4.4.0
* @since 4.7.0 The $component parameter was added for parity with PHP's parse_url().
* *
* @param string $url The URL to parse. * @param string $url The URL to parse.
* @param int $component The specific component to retrieve. Use one of the PHP * @return bool|array False on failure; Array of URL components on success;
* predefined constants to specify which one. * See parse_url()'s return values.
* Defaults to -1 (= return all parts as an array).
* @see http://php.net/manual/en/function.parse-url.php
* @return mixed False on failure; Array of URL components on success;
* When a specific component has been requested: null if the component doesn't
* exist in the given URL; a sting or - in the case of PHP_URL_PORT - integer
* when it does; See parse_url()'s return values.
*/ */
function wp_parse_url( $url, $component = -1 ) { function wp_parse_url( $url ) {
$parts = @parse_url( $url, $component ); $parts = @parse_url( $url );
if ( ! $parts ) {
if ( version_compare( PHP_VERSION, '5.4.7', '>=' ) ) {
return $parts;
}
if ( false === $parts ) {
// < PHP 5.4.7 compat, trouble with relative paths including a scheme break in the path // < PHP 5.4.7 compat, trouble with relative paths including a scheme break in the path
if ( '/' == $url[0] && false !== strpos( $url, '://' ) ) { if ( '/' == $url[0] && false !== strpos( $url, '://' ) ) {
// Since we know it's a relative path, prefix with a scheme/host placeholder and try again // Since we know it's a relative path, prefix with a scheme/host placeholder and try again
if ( ! $parts = @parse_url( 'placeholder://placeholder' . $url, $component ) ) { if ( ! $parts = @parse_url( 'placeholder://placeholder' . $url ) ) {
return $parts; return $parts;
} }
if ( is_array( $parts ) ) { // Remove the placeholder values
// Remove the placeholder values unset( $parts['scheme'], $parts['host'] );
unset( $parts['scheme'], $parts['host'] );
}
} else { } else {
return $parts; return $parts;
} }
} }
// < PHP 5.4.7 compat, doesn't detect a schemeless URL's host field // < PHP 5.4.7 compat, doesn't detect schemeless URL's host field
if ( '//' == substr( $url, 0, 2 ) ) { if ( '//' == substr( $url, 0, 2 ) && ! isset( $parts['host'] ) ) {
if ( -1 === $component && ! isset( $parts['host'] ) ) { $path_parts = explode( '/', substr( $parts['path'], 2 ), 2 );
$path_parts = explode( '/', substr( $parts['path'], 2 ), 2 ); $parts['host'] = $path_parts[0];
$parts['host'] = $path_parts[0]; if ( isset( $path_parts[1] ) ) {
if ( isset( $path_parts[1] ) ) { $parts['path'] = '/' . $path_parts[1];
$parts['path'] = '/' . $path_parts[1]; } else {
} else { unset( $parts['path'] );
unset( $parts['path'] );
}
} elseif ( PHP_URL_HOST === $component || PHP_URL_PATH === $component ) {
$all_parts = @parse_url( $url );
if ( ! isset( $all_parts['host'] ) ) {
$path_parts = explode( '/', substr( $all_parts['path'], 2 ), 2 );
if ( PHP_URL_PATH === $component ) {
if ( isset( $path_parts[1] ) ) {
$parts = '/' . $path_parts[1];
} else {
$parts = null;
}
} elseif ( PHP_URL_HOST === $component ) {
$parts = $path_parts[0];
}
}
} }
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38455'; $wp_version = '4.7-alpha-38456';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.