sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

HTTP: Accept non-string values in cookies, fixing a regression since 4.5.

Browse Source 
Props swissspidy.
Fixes #37768 for trunk.


git-svn-id: https://develop.svn.wordpress.org/trunk@38430 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2016-08-29 02:41:56 +00:00
parent 7f2a81061a
commit e916b9e14c
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/class-http.php
View File

@ -436,7 +436,7 @@ class WP_Http {
foreach ( $cookies as $name => $value ) { foreach ( $cookies as $name => $value ) {
if ( $value instanceof WP_Http_Cookie ) { if ( $value instanceof WP_Http_Cookie ) {
$cookie_jar[ $value->name ] = new Requests_Cookie( $value->name, $value->value, $value->get_attributes() ); $cookie_jar[ $value->name ] = new Requests_Cookie( $value->name, $value->value, $value->get_attributes() );
} elseif ( is_string( $value ) ) { } elseif ( is_scalar( $value ) ) {
$cookie_jar[ $name ] = new Requests_Cookie( $name, $value ); $cookie_jar[ $name ] = new Requests_Cookie( $name, $value );
} }
} }

31
tests/phpunit/tests/http/http.php
View File

@ -118,4 +118,35 @@ class Tests_HTTP_HTTP extends WP_UnitTestCase {
$this->assertEquals( array_keys( $wp_header_to_desc ), array_values( $constants ) ); $this->assertEquals( array_keys( $wp_header_to_desc ), array_values( $constants ) );
} }
/**
* @ticket 37768
*/
public function test_normalize_cookies_scalar_values() {
$http = _wp_http_get_object();
$cookies = array(
'x' => 'foo',
'y' => 2,
'z' => 0.45,
'foo' => array( 'bar' ),
);
$cookie_jar = $http->normalize_cookies( array(
'x' => 'foo',
'y' => 2,
'z' => 0.45,
'foo' => array( 'bar' ),
) );
$this->assertInstanceOf( 'Requests_Cookie_Jar', $cookie_jar );
foreach( array_keys( $cookies ) as $cookie ) {
if ( 'foo' === $cookie ) {
$this->assertFalse( isset( $cookie_jar[ $cookie ] ) );
} else {
$this->assertInstanceOf( 'Requests_Cookie', $cookie_jar[ $cookie ] );
}
}
}
} }