Changeset 23603

Timestamp:

03/04/2013 04:10:36 AM (14 years ago)

Author:

dd32

Message:

WP_HTTP: Funnel all redirect requests through WP_HTTP::request() via wp_remote_request() to ensure that the proper transport is chosen for redirects.
This change also moves PHP Streams from redirecting internally, to us handling the redirections in PHP, which brings a more consistent behaviour between transports.
Fixes #23682

File:

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

trunk/wp-includes/class-http.php

@@ -780 +780 @@
                 if ( isset($arrHeaders['headers']['location']) && 0 !== $r['_redirection'] ) {
                         if ( $r['redirection']-- > 0 ) {
-                                return $this->request( WP_HTTP::make_absolute_url( $arrHeaders['headers']['location'], $url ), $r);
+                                return wp_remote_request( WP_HTTP::make_absolute_url( $arrHeaders['headers']['location'], $url ), $r);
                         } else {
                                 return new WP_Error('http_request_failed', __('Too many redirects.'));
@@ -890 +890 @@
                                 'method' => strtoupper($r['method']),
                                 'user_agent' => $r['user-agent'],
-                                'max_redirects' => $r['redirection'] + 1, // See #11557
+                                'max_redirects' => 0, // Follow no redirects
+                                'follow_redirects' => false,
                                 'protocol_version' => (float) $r['httpversion'],
                                 'header' => $strHeaders,
@@ -963 +964 @@
                         $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']);
 
-                // Streams does not provide an error code which we can use to see why the request stream stopped.
-                // We can however test to see if a location header is present and return based on that.
-                if ( isset($processedHeaders['headers']['location']) && 0 !== $args['_redirection'] )
-                        return new WP_Error('http_request_failed', __('Too many redirects.'));
+                if ( ! empty( $processedHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections
+                        if ( $r['redirection']-- > 0 ) {
+                                return wp_remote_request( WP_HTTP::make_absolute_url( $processedHeaders['headers']['location'], $url ), $r );
+                        } else {
+                                return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
+                        }
+                }
 
                 if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] )
@@ -1181 +1185 @@
                 if ( ! empty( $theHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections
                         if ( $r['redirection']-- > 0 ) {
-                                return $this->request( WP_HTTP::make_absolute_url( $theHeaders['headers']['location'], $url ), $r );
+                                return wp_remote_request( WP_HTTP::make_absolute_url( $theHeaders['headers']['location'], $url ), $r );
                         } else {
                                 return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );