Changeset 31290 for trunk/src/wp-includes/class-http.php

Timestamp:

01/29/2015 03:57:42 AM (12 years ago)

Author:

dd32

Message:

HTTP API: Fix an issue where the limit_response_size parameter wasn't working properly with large documents and the cURL transport.
Fixes #31172

File:

• trunk/src/wp-includes/class-http.php (modified) (1 diff)

trunk/src/wp-includes/class-http.php

@@ -1521 +1521 @@
                 // If an error occurred, or, no response.
                 if ( $curl_error || ( 0 == strlen( $theBody ) && empty( $theHeaders['headers'] ) ) ) {
-                        if ( CURLE_WRITE_ERROR /* 23 */ == $curl_error && $r['stream'] ) {
+                        if ( CURLE_WRITE_ERROR /* 23 */ == $curl_error ) {
                                 if ( ! $this->max_body_length || $this->max_body_length != $bytes_written_total ) {
-                                        fclose( $this->stream_handle );
-                                        return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) );
+                                        if ( $r['stream'] ) {
+                                                curl_close( $handle );
+                                                fclose( $this->stream_handle );
+                                                return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) );
+                                        } else {
+                                                curl_close( $handle );
+                                                return new WP_Error( 'http_request_failed', curl_error( $handle ) );
+                                        }
                                 }
                         } else {