Changeset 24483 for branches/3.5

Timestamp:

06/21/2013 06:22:16 AM (13 years ago)

Author:

nacin

Message:

Merge [23603] and [23608] to the 3.5 branch. This funnels all redirect requests through WP_HTTP::request() via wp_remote_request(). see #23682.

Location:

branches/3.5

Files:

• . (modified) (1 prop)
• wp-includes/class-http.php (modified) (5 diffs)

branches/3.5/wp-includes/class-http.php

@@ -110 +110 @@
                 $r = apply_filters( 'http_request_args', $r, $url );
 
-                // Certain classes decrement this, store a copy of the original value for loop purposes.
-                $r['_redirection'] = $r['redirection'];
+                // The transports decrement this, store a copy of the original value for loop purposes.
+                if ( ! isset( $r['_redirection'] ) )
+                        $r['_redirection'] = $r['redirection'];
 
                 // Allow plugins to short-circuit the request
@@ -783 +784 @@
                 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.'));
@@ -893 +894 @@
                                 '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,
@@ -966 +968 @@
                         $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'] )
@@ -1186 +1191 @@
                 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.' ) );