Changeset 13849 for trunk/wp-includes/class-http.php

Timestamp:

03/28/2010 12:56:43 AM (15 years ago)

Author:

dd32

Message:

Avoid notices for requests with no body. Also fixes a few race conditions related to headers. Fixes #11872

File:

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

trunk/wp-includes/class-http.php

@@ -393 +393 @@
      */
     function processResponse($strResponse) {
-        list($theHeaders, $theBody) = explode("\r\n\r\n", $strResponse, 2);
-        return array('headers' => $theHeaders, 'body' => $theBody);
+        $res = explode("\r\n\r\n", $strResponse, 2);
+        
+        return array('headers' => isset($res[0]) ? $res[0] : array(), 'body' => isset($res[1]) ? $res[1] : '');
     }
 
@@ -427 +428 @@
         // In this case, determine the final HTTP header and parse from there.
         for ( $i = count($headers)-1; $i >= 0; $i-- ) {
-            if ( false === strpos($headers[$i], ':') ) {
+            if ( !empty($headers[$i]) && false === strpos($headers[$i], ':') ) {
                 $headers = array_splice($headers, $i);
                 break;
@@ -440 +441 @@
 
             if ( false === strpos($tempheader, ':') ) {
-                list( , $iResponseCode, $strResponseMsg) = explode(' ', $tempheader, 3);
-                $response['code'] = $iResponseCode;
-                $response['message'] = $strResponseMsg;
+                list( , $response['code'], $response['message']) = explode(' ', $tempheader, 3);
                 continue;
             }
@@ -1229 +1228 @@
             return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
 
-        list($theHeaders, $theBody) = explode("\r\n\r\n", $strResponse, 2);
+        $headers_body = WP_HTTP::processResponse($strResponse);
+        $theHeaders = $headers_body['headers'];
+        $theBody = $headers_body['body'];
+        unset($headers_body);
+
         $theHeaders = WP_Http::processHeaders($theHeaders);