Changeset 38164 for trunk/src/wp-includes/class-http.php

Timestamp:

07/27/2016 03:31:48 PM (5 years ago)

Author:

ocean90

Message:

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.

File:

• trunk/src/wp-includes/class-http.php (modified) (3 diffs)

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

@@ -326 +326 @@
         }
 
-        // 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'] );
         }
 
@@ -415 +415 @@
 
     /**
+     * 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.
      *
@@ -421 +445 @@
      * 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.
      */