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

Timestamp:

03/04/2013 04:47:39 AM (13 years ago)

Author:

dd32

Message:

WP_HTTP: Return error responses from cURL for non-blocking requests. Contrary to popular belief, cURL's non-blocking requests are not exact non-blocking, we still wait for cURL to make the request before returning, so making this change aids in development debugging. Props SergeyBiryukov Fixes #23310

File:

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

trunk/wp-includes/class-http.php

@@ -1207 +1207 @@
         if ( ! $r['blocking'] ) {
             curl_exec( $handle );
+
+            if ( $curl_error = curl_error( $handle ) ) {
+                curl_close( $handle );
+                return new WP_Error( 'http_request_failed', $curl_error );
+            }
+            if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ) ) ) {
+                curl_close( $handle );
+                return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
+            }
+
             curl_close( $handle );
             return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
@@ -1220 +1230 @@
         // If no response
         if ( 0 == strlen( $theBody ) && empty( $theHeaders['headers'] ) ) {
-            if ( $curl_error = curl_error( $handle ) )
+            if ( $curl_error = curl_error( $handle ) ) {
+                curl_close( $handle );
                 return new WP_Error( 'http_request_failed', $curl_error );
-            if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ) ) )
+            }
+            if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ) ) ) {
+                curl_close( $handle );
                 return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
+            }
         }