Changeset 17551

Timestamp:

03/24/2011 05:18:34 AM (15 years ago)

Author:

dd32

Message:

Allow for array('redirection' => 0) to bypass WP_Error on redirects being encountered; Allows HEAD requests WITH 'redirection' > 0 specified at call time to follow redirections; Standardises on return values from all transports to act the same based on the Unit Tests. Fixes #16855

File:

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

trunk/wp-includes/class-http.php

@@ -101 +101 @@
                 );
 
+                
+                // Pre-parse for the HEAD checks.
+                $args = wp_parse_args( $args );
+
+                // By default, Head requests do not cause redirections.
+                if ( isset($args['method']) && 'HEAD' == $args['method'] )
+                        $defaults['redirection'] = 0;
+
                 $r = wp_parse_args( $args, $defaults );
                 $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'];
 
                 // Allow plugins to short-circuit the request
@@ -665 +676 @@
 
                 // If location is found, then assume redirect and redirect to location.
-                if ( 'HEAD' != $r['method'] && isset($arrHeaders['headers']['location']) ) {
+                if ( isset($arrHeaders['headers']['location']) && 0 !== $r['_redirection'] ) {
                         if ( $r['redirection']-- > 0 ) {
                                 return $this->request($arrHeaders['headers']['location'], $r);
@@ -801 +812 @@
                 }
 
-                if ( 'HEAD' == $r['method'] ) // Disable redirects for HEAD requests
-                        $arrContext['http']['max_redirects'] = 1;
-
                 if ( ! empty($r['body'] ) )
                         $arrContext['http']['content'] = $r['body'];
@@ -837 +845 @@
                 else
                         $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']);
+
+                // Streams does not provide an error code which we can use to see why the request stream stoped. 
+                // 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( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] )
@@ -950 +963 @@
                 );
 
-                if ( HTTP_METH_HEAD == $r['method'] )
-                        $options['redirect'] = 0; // Assumption: Docs seem to suggest that this means do not follow. Untested.
-
                 // The HTTP extensions offers really easy proxy support.
                 $proxy = new WP_HTTP_Proxy();
@@ -1117 +1127 @@
 
                 // The option doesn't work with safe mode or when open_basedir is set.
-                // Disable HEAD when making HEAD requests.
-                if ( !ini_get('safe_mode') && !ini_get('open_basedir') && 'HEAD' != $r['method'] )
+                if ( !ini_get('safe_mode') && !ini_get('open_basedir') && 0 !== $r['_redirection'] )
                         curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, true );
 
@@ -1177 +1186 @@
 
                 // See #11305 - When running under safe mode, redirection is disabled above. Handle it manually.
-                if ( !empty($theHeaders['headers']['location']) && (ini_get('safe_mode') || ini_get('open_basedir')) ) {
+                if ( !empty($theHeaders['headers']['location']) && (ini_get('safe_mode') || ini_get('open_basedir')) && 0 !== $r['_redirection'] ) {
                         if ( $r['redirection']-- > 0 ) {
                                 return $this->request($theHeaders['headers']['location'], $r);