Changeset 38430 for trunk

Timestamp:

08/29/2016 02:41:56 AM (10 years ago)

Author:

dd32

Message:

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

Props swissspidy.
Fixes #37768 for trunk.

Location:

trunk

Files:

• src/wp-includes/class-http.php (modified) (1 diff)
• tests/phpunit/tests/http/http.php (modified) (1 diff)

trunk/src/wp-includes/class-http.php

@@ -437 +437 @@
                         if ( $value instanceof WP_Http_Cookie ) {
                                 $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 );
                         }

trunk/tests/phpunit/tests/http/http.php

@@ -119 +119 @@
 
         }
+
+        /**
+         * @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 ] );
+                        }
+                }
+        }
 }