From 94ad9a773f8284cad5302a0744d1ecec21ae6e0a Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 13 Aug 2008 05:09:59 +0000
Subject: [PATCH] Fix bugs in chunked encoding handling. See #4779 props
 santosj.

git-svn-id: http://svn.automattic.com/wordpress/trunk@8634 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/http.php | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/wp-includes/http.php b/wp-includes/http.php
index 13aebb01eb..0ba18c6518 100644
--- a/wp-includes/http.php
+++ b/wp-includes/http.php
@@ -351,8 +351,10 @@ class WP_Http {
 	 * difficult to support it though.
 	 *
 	 * @todo Add support for footer chunked headers.
-	 *
+	 * @access public
+	 * @since 2.7
 	 * @static
+	 *
 	 * @param string $body Body content
 	 * @return bool|string|WP_Error False if not chunked encoded. WP_Error on failure. Chunked decoded body on success.
 	 */
@@ -362,10 +364,8 @@ class WP_Http {
 		if ( ! preg_match( '/^[0-9a-f]+(\s|\n)+/mi', trim($body) ) )
 			return false;
 
-		$hex = '';
-		$dec = 0;
 		$parsedBody = '';
-		$parsedHeaders = array();
+		//$parsedHeaders = array(); Unsupported
 
 		$done = false;
 
@@ -380,14 +380,12 @@ class WP_Http {
 				$length = hexdec( $match[1] );
 				$chunkLength = strlen( $match[0] );
 
-				if( $body{$length+$chunkLength} == "\n" )
-					$length++;
-
 				$strBody = substr($body, strlen( $match[0] ), $length);
 				$parsedBody .= $strBody;
-				$body = str_replace(array($match[0], $strBody), '', $body);
 
-				if( "0" == $body ) {
+				$body = ltrim(str_replace(array($match[0], $strBody), '', $body), "\n");
+
+				if( "0" == trim($body) ) {
 					$done = true;
 					return $parsedBody; // Ignore footer headers.
 					break;
@@ -511,9 +509,14 @@ class WP_Http_Fsockopen {
 		$process = WP_Http::processResponse($strResponse);
 		$arrHeaders = WP_Http::processHeaders($process['headers']);
 
-		if ( WP_Http_Fsockopen::is400Response($arrHeaders['response']['code']) )
+		// Is the response code within the 400 range?
+		if ( (int) $arrHeaders['response']['code'] >= 400 && (int) $arrHeaders['response']['code'] < 500 )
 			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 ) {
@@ -539,22 +542,6 @@ class WP_Http_Fsockopen {
 
 		return false;
 	}
-
-	/**
-	 * Whether response code is in the 400 range.
-	 *
-	 * @access public
-	 * @static
-	 * @since 2.7
-	 *
-	 * @param string $response Response code.
-	 * @return bool True if 40x Response, false if something else.
-	 */
-	function is400Response($response) {
-		if ( is_numeric($response) && (int) substr($response, 0, 1) == 4 )
-			return true;
-		return false;
-	}
 }
 
 /**
@@ -639,7 +626,7 @@ class WP_Http_Fopen {
 		$processedHeaders = WP_Http::processHeaders($theHeaders);
 
 		if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] )
-			$theBody = WP_Http::chunkTransferDecode($strResponse);
+			$strResponse = WP_Http::chunkTransferDecode($strResponse);
 
 		return array('headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response']);
 	}
@@ -751,7 +738,7 @@ class WP_Http_Streams {
 		$processedHeaders = WP_Http::processHeaders($meta['wrapper_data']);
 
 		if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] )
-			$theBody = WP_Http::chunkTransferDecode($strResponse);
+			$strResponse = WP_Http::chunkTransferDecode($strResponse);
 
 		fclose($handle);