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

Timestamp:

08/17/2013 01:19:04 AM (13 years ago)

Author:

dd32

Message:

WP_HTTP: Cookies: When following redirects, include the request cookies in the redirected requests. Fixes #24987

File:

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

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

@@ -196 +196 @@
                 }
 
-                return $this->_dispatch_request($url, $r);
+                $response = $this->_dispatch_request($url, $r);
+
+                // Append cookies that were used in this request to the response
+                if ( ! empty( $r['cookies'] ) ) {
+                $cookies_set = wp_list_pluck( $response['cookies'], 'name' );
+                foreach ( $r['cookies'] as $cookie ) {
+                        if ( ! in_array( $cookie->name, $cookies_set ) && $cookie->test( $url ) ) {
+                                        $response['cookies'][] = $cookie;
+                        }
+                }
+                }
+
+                return $response;
         }
 
@@ -638 +650 @@
                         if ( in_array( $response['response']['code'], array( 302, 303 ) ) )
                                 $args['method'] = 'GET';
+                }
+
+                // Include valid cookies in the redirect process
+                if ( ! empty( $response['cookies'] ) ) {
+                foreach ( $response['cookies'] as $cookie ) {
+                        if ( $cookie->test( $redirect_location ) )
+                                $args['cookies'][] = $cookie;
+                        }
                 }