WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTP API: Add a `$component` parameter to `wp_parse_url()` to give it parity with PHP's `parse_url()` function. 

Fixes #36356
Props jrf

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


git-svn-id: http://core.svn.wordpress.org/trunk@38637 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2016-09-30 21:47:28 +00:00
parent b154ab767e
commit a51267269b
2 changed files with 53 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
wp-includes/http.php
View File

@ -633,29 +633,47 @@ function ms_allowed_http_request_hosts( $is_external, $host ) {
* when URL parsing failed.
*
* @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.
* @return bool|array False on failure; Array of URL components on success;
* See parse_url()'s return values.
* @param int $component The specific component to retrieve. Use one of the PHP
* predefined constants to specify which one.
* 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 ) {
$parts = @parse_url( $url );
if ( ! $parts ) {
// < PHP 5.4.7 compat, trouble with relative paths including a scheme break in the path
if ( '/' == $url[0] && false !== strpos( $url, '://' ) ) {
// Since we know it's a relative path, prefix with a scheme/host placeholder and try again
if ( ! $parts = @parse_url( 'placeholder://placeholder' . $url ) ) {
function wp_parse_url( $url, $component = -1 ) {
$parts = @parse_url( $url, $component );
if ( version_compare( PHP_VERSION, '5.4.7', '>=' ) ) {
return $parts;
}
// Remove the placeholder values
if ( false === $parts ) {
// < PHP 5.4.7 compat, trouble with relative paths including a scheme break in the path.
if ( '/' == $url[0] && false !== strpos( $url, '://' ) ) {
if ( in_array( $component, array( PHP_URL_SCHEME, PHP_URL_HOST ), true ) ) {
return null;
}
// 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 ) ) {
return $parts;
}
// Remove the placeholder values.
if ( -1 === $component ) {
unset( $parts['scheme'], $parts['host'] );
}
} else {
return $parts;
}
}
// < PHP 5.4.7 compat, doesn't detect schemeless URL's host field
if ( '//' == substr( $url, 0, 2 ) && ! isset( $parts['host'] ) ) {
// < PHP 5.4.7 compat, doesn't detect a schemeless URL's host field.
if ( '//' == substr( $url, 0, 2 ) ) {
if ( -1 === $component && ! isset( $parts['host'] ) ) {
$path_parts = explode( '/', substr( $parts['path'], 2 ), 2 );
$parts['host'] = $path_parts[0];
if ( isset( $path_parts[1] ) ) {
@ -663,6 +681,21 @@ function wp_parse_url( $url ) {
} else {
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];
}
}
}
}
return $parts;

2
wp-includes/version.php
View File

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