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

HTTP API: Normalize cookies before passing them to Requests. 

Requests has its own cookie object in form of `Requests_Cookie`. Therefore we have to convert `WP_Http_Cookie` objects to `Requests_Cookie`.
This introduces `WP_Http_Cookie::get_attributes()` to retrieve cookie attributes of a `WP_Http_Cookie` object and `WP_Http::normalize_cookies()` to convert the cookie objects.

Fixes #37437.
Built from https://develop.svn.wordpress.org/trunk@38164


git-svn-id: http://core.svn.wordpress.org/trunk@38105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-07-27 15:32:27 +00:00
parent 962f107035
commit b2607f8d78
4 changed files with 59 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
wp-includes/class-http.php
View File

@ -325,9 +325,9 @@ class WP_Http {
$options['max_bytes'] = $r['limit_response_size'];
}
// If we've got cookies, use them
// If we've got cookies, use and convert them to Requests_Cookie.
if ( ! empty( $r['cookies'] ) ) {
$options['cookies'] = $r['cookies'];
$options['cookies'] = WP_Http::normalize_cookies( $r['cookies'] );
}
// SSL certificate handling
@ -413,6 +413,30 @@ class WP_Http {
return apply_filters( 'http_response', $response, $r, $url );
}
/**
* Normalizes cookies for using in Requests.
*
* @since 4.6.0
* @access public
* @static
*
* @param array $cookies List of cookies to send with the request.
* @return Requests_Cookie_Jar Cookie holder object.
*/
public static function normalize_cookies( $cookies ) {
$cookie_jar = new Requests_Cookie_Jar();
foreach ( $cookies as $name => $value ) {
if ( $value instanceof WP_Http_Cookie ) {
$cookie_jar[ $value->name ] = new Requests_Cookie( $value->name, $value->value, $value->get_attributes() );
} elseif ( is_string( $value ) ) {
$cookie_jar[ $name ] = new Requests_Cookie( $name, $value );
}
}
return $cookie_jar;
}
/**
* Match redirect behaviour to browser handling.
*
@ -420,9 +444,13 @@ class WP_Http {
* RFC 7231, user agents can deviate from the strict reading of the
* specification for compatibility purposes.
*
* @param string $location URL to redirect to.
* @param array $headers Headers for the redirect.
* @param array $options Redirect request options.
* @since 4.6.0
* @access public
* @static
*
* @param string $location URL to redirect to.
* @param array $headers Headers for the redirect.
* @param array $options Redirect request options.
* @param Requests_Response $original Response object.
*/
public static function browser_redirect_compatibility( $location, $headers, $data, &$options, $original ) {

22
wp-includes/class-wp-http-cookie.php
View File

@ -216,4 +216,26 @@ class WP_Http_Cookie {
public function getFullHeader() {
return 'Cookie: ' . $this->getHeaderValue();
}
/**
* Retrieves cookie attributes.
*
* @since 4.6.0
* @access public
*
* @return array {
* List of attributes.
*
* @type string $expires When the cookie expires.
* @type string $path Cookie URL path.
* @type string $domain Cookie domain.
* }
*/
public function get_attributes() {
return array(
'expires' => $this->expires,
'path' => $this->path,
'domain' => $this->domain,
);
}
}

6
wp-includes/class-wp-http-requests-response.php
View File

@ -176,9 +176,9 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
$cookies[] = new WP_Http_Cookie( array(
'name' => $cookie->name,
'value' => urldecode( $cookie->value ),
'expires' => $cookie->attributes['expires'],
'path' => $cookie->attributes['path'],
'domain' => $cookie->attributes['domain'],
'expires' => isset( $cookie->attributes['expires'] ) ? $cookie->attributes['expires'] : null,
'path' => isset( $cookie->attributes['path'] ) ? $cookie->attributes['path'] : null,
'domain' => isset( $cookie->attributes['domain'] ) ? $cookie->attributes['domain'] : null,
));
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-beta4-38163';
$wp_version = '4.6-beta4-38164';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.