Changeset 10284

Timestamp:

12/31/2008 03:03:26 AM (16 years ago)

Author:

ryan

Message:

Chunked decoding fix from jacobsantos. fixes #8618 for 2.7

File:

• branches/2.7/wp-includes/http.php (modified) (3 diffs)

branches/2.7/wp-includes/http.php

@@ -392 +392 @@
      *
      * @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 string Chunked decoded body on success or raw body on failure.
      */
     function chunkTransferDecode($body) {
@@ -403 +403 @@
         //$parsedHeaders = array(); Unsupported
 
-        $done = false;
-
-        do {
+        while ( true ) {
             $hasChunk = (bool) preg_match( '/^([0-9a-f]+)(\s|\n)+/mi', $body, $match );
 
             if ( $hasChunk ) {
-                if ( empty($match[1]) ) {
-                    return new WP_Error('http_chunked_decode', __('Does not appear to be chunked encoded or body is malformed.') );
-                }
+                if ( empty($match[1]) )
+                    return $body;
 
                 $length = hexdec( $match[1] );
@@ -421 +418 @@
                 $body = ltrim(str_replace(array($match[0], $strBody), '', $body), "\n");
 
-                if( "0" == trim($body) ) {
-                    $done = true;
+                if( "0" == trim($body) )
                     return $parsedBody; // Ignore footer headers.
-                    break;
-                }
             } else {
-                return new WP_Error('http_chunked_decode', __('Does not appear to be chunked encoded or body is malformed.') );
+                return $body;
             }
-        } while ( false === $done );
+        }
     }
 }