Changeset 20208

Timestamp:

03/18/2012 05:00:05 AM (13 years ago)

Author:

dd32

Message:

WP_HTTP: Curl: Handle Redirections in PHP rather than internally in Curl, Simplifies code flow between safe_mode On and Off, and works around certain bugs. Props simonwheatley for initial patch. Fixes #20219, Fixes #17490

File:

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

trunk/wp-includes/class-http.php

@@ -1039 +1039 @@
         curl_setopt( $handle, CURLOPT_SSL_VERIFYPEER, $ssl_verify );
         curl_setopt( $handle, CURLOPT_USERAGENT, $r['user-agent'] );
-        curl_setopt( $handle, CURLOPT_MAXREDIRS, $r['redirection'] );
+        // The option doesn't work with safe mode or when open_basedir is set, and there's a
+        // bug #17490 with redirected POST requests, so handle redirections outside Curl.
+        curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, false );
 
         switch ( $r['method'] ) {
@@ -1076 +1078 @@
         }
 
-        // The option doesn't work with safe mode or when open_basedir is set.
-        if ( !ini_get('safe_mode') && !ini_get('open_basedir') && 0 !== $r['_redirection'] )
-            curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, true );
-
         if ( !empty( $r['headers'] ) ) {
             // cURL expects full header strings in each element
@@ -1112 +1110 @@
             $theBody = $theResponse;
 
-        // If no response, and It's not a HEAD request with valid headers returned
-        if ( 0 == strlen($theResponse) && ('HEAD' != $r['method'] || empty($this->headers)) ) {
+        // If no response
+        if ( 0 == strlen($theResponse) && empty( $theHeaders ) ) {
             if ( $curl_error = curl_error($handle) )
                 return new WP_Error('http_request_failed', $curl_error);
@@ -1132 +1130 @@
 
         // 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' ) ) && 0 !== $r['_redirection'] ) {
+        if ( ! empty( $theHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections
             if ( $r['redirection']-- > 0 ) {
                 return $this->request( $theHeaders['headers']['location'], $r );