WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
westi 2008-08-13 05:09:59 +00:00
parent f41858edcf
commit 94ad9a773f
1 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
wp-includes/http.php
View File

@ -351,8 +351,10 @@ class WP_Http {
* difficult to support it though. * difficult to support it though.
* *
* @todo Add support for footer chunked headers. * @todo Add support for footer chunked headers.
* * @access public
* @since 2.7
* @static * @static
*
* @param string $body Body content * @param string $body Body content
* @return bool|string|WP_Error False if not chunked encoded. WP_Error on failure. Chunked decoded body on success. * @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) ) ) if ( ! preg_match( '/^[0-9a-f]+(\s|\n)+/mi', trim($body) ) )
return false; return false;
$hex = '';
$dec = 0;
$parsedBody = ''; $parsedBody = '';
$parsedHeaders = array(); //$parsedHeaders = array(); Unsupported
$done = false; $done = false;
@ -380,14 +380,12 @@ class WP_Http {
$length = hexdec( $match[1] ); $length = hexdec( $match[1] );
$chunkLength = strlen( $match[0] ); $chunkLength = strlen( $match[0] );
if( $body{$length+$chunkLength} == "\n" )
$length++;
$strBody = substr($body, strlen( $match[0] ), $length); $strBody = substr($body, strlen( $match[0] ), $length);
$parsedBody .= $strBody; $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; $done = true;
return $parsedBody; // Ignore footer headers. return $parsedBody; // Ignore footer headers.
break; break;
@ -511,9 +509,14 @@ class WP_Http_Fsockopen {
$process = WP_Http::processResponse($strResponse); $process = WP_Http::processResponse($strResponse);
$arrHeaders = WP_Http::processHeaders($process['headers']); $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']); 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 location is found, then assume redirect and redirect to location.
if ( isset($arrHeaders['headers']['location']) ) { if ( isset($arrHeaders['headers']['location']) ) {
if ( $r['redirection']-- > 0 ) { if ( $r['redirection']-- > 0 ) {
@ -539,22 +542,6 @@ class WP_Http_Fsockopen {
return false; 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); $processedHeaders = WP_Http::processHeaders($theHeaders);
if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] ) 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']); 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']); $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']);
if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] ) 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); fclose($handle);