Changeset 9091

Timestamp:

10/06/2008 11:10:22 PM (16 years ago)

Author:

ryan

Message:

Chunked encoding fixes from DD32. fixes #7770

File:

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

trunk/wp-includes/http.php

@@ -531 +531 @@
             return new WP_Error('http_request_failed', $arrHeaders['response']['code'] . ': ' . $arrHeaders['response']['message']);
 
-        // If the body was chunk encoded, then decode it.
-        if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] )
-            $process['body'] = WP_Http::chunkTransferDecode($process['body']);
-
         // If location is found, then assume redirect and redirect to location.
         if ( isset($arrHeaders['headers']['location']) ) {
             if ( $r['redirection']-- > 0 ) {
                 return $this->request($arrHeaders['headers']['location'], $r);
+            } else {
+                return new WP_Error('http_request_failed', __('Too many redirects.'));
             }
-            else
-                return new WP_Error('http_request_failed', __('Too many redirects.'));
-        }
+        }
+
+        // If the body was chunk encoded, then decode it.
+        if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] )
+            $process['body'] = WP_Http::chunkTransferDecode($process['body']);
 
         return array('headers' => $arrHeaders['headers'], 'body' => $process['body'], 'response' => $arrHeaders['response']);
@@ -859 +859 @@
         );
 
-        $strResponse = http_request($r['method'], $url, $r['body'], $options, $info);
-
-        if ( false === $strResponse )
+        if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) ) //Emits warning level notices for max redirects and timeouts
+            $strResponse = @http_request($r['method'], $url, $r['body'], $options, $info);
+        else
+            $strResponse = http_request($r['method'], $url, $r['body'], $options, $info); //Emits warning level notices for max redirects and timeouts
+
+        if ( false === $strResponse || ! empty($info['error']) ) //Error may still be set, Response may return headers or partial document, and error contains a reason the request was aborted, eg, timeout expired or max-redirects reached
             return new WP_Error('http_request_failed', $info['response_code'] . ': ' . $info['error']);
 
@@ -870 +873 @@
         $theHeaders = WP_Http::processHeaders($theHeaders);
 
-        if ( ! empty( $theBody ) && isset( $theHeaders['headers']['transfer-encoding'] ) && 'chunked' == $theHeaders['headers']['transfer-encoding'] )
-            $theBody = http_chunked_decode($theBody);
+        if ( ! empty( $theBody ) && isset( $theHeaders['headers']['transfer-encoding'] ) && 'chunked' == $theHeaders['headers']['transfer-encoding'] ) {
+            if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
+                $theBody = @http_chunked_decode($theBody);
+            else
+                $theBody = http_chunked_decode($theBody);
+        }
 
         $theResponse = array();
@@ -971 +978 @@
         $theResponse = curl_exec( $handle );
 
-        list($theHeaders, $theBody) = explode("\r\n\r\n", $theResponse, 2);
-        $theHeaders = WP_Http::processHeaders($theHeaders);
-
-        if ( ! empty( $theBody ) && isset( $theHeaders['headers']['transfer-encoding'] ) && 'chunked' == $theHeaders['headers']['transfer-encoding'] )
-            $theBody = WP_Http::chunkTransferDecode($theBody);
-
+        if ( $theResponse ) {
+            $headerLength = curl_getinfo($handle, CURLINFO_HEADER_SIZE);
+            $theHeaders = trim( substr($theResponse, 0, $headerLength) );
+            $theBody = substr( $theResponse, $headerLength );
+            if ( false !== strrpos($theHeaders, "\r\n\r\n") ) {
+                $headerParts = explode("\r\n\r\n", $theHeaders);
+                $theHeaders = $headerParts[ count($headerParts) -1 ];
+            }
+            $theHeaders = WP_Http::processHeaders($theHeaders);
+        } else {
+            if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array(301, 302) ) )
+                return new WP_Error('http_request_failed', __('Too many redirects.'));
+            $theHeaders = array( 'headers' => array() );
+            $theBody = '';
+        }
         $response = array();
         $response['code'] = curl_getinfo( $handle, CURLINFO_HTTP_CODE );