Changeset 12747

Timestamp:

01/17/2010 08:15:52 AM (11 years ago)

Author:

dd32

Message:

Allow cURL to follow redirects when running under safe_mode or open_basedir. See #11305

File:

• trunk/wp-includes/http.php (modified) (1 diff)

trunk/wp-includes/http.php

@@ -1397 +1397 @@
         if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) )
             $theBody = WP_Http_Encoding::decompress( $theBody );
+
+        // See #11605 - 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 ( $r['redirection']-- > 0 ) {
+                return $this->request($theHeaders['headers']['location'], $r);
+            } else {
+                return new WP_Error('http_request_failed', __('Too many redirects.'));
+            }
+        }
 
         return array('headers' => $theHeaders['headers'], 'body' => $theBody, 'response' => $response, 'cookies' => $theHeaders['cookies']);