Changeset 31290

Timestamp:

01/29/2015 03:57:42 AM (10 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

Location:

trunk

Files:

• src/wp-includes/class-http.php (modified) (1 diff)
• tests/phpunit/tests/http/base.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 {

trunk/tests/phpunit/tests/http/base.php

@@ -217 +217 @@
 
     /**
+     * Tests Limiting the response size when returning strings
+     *
+     * @ticket 31172
+     */
+    function test_request_limited_size() {
+        // we'll test against a file in the unit test data
+        $url = 'http://develop.svn.wordpress.org/trunk/tests/phpunit/data/images/2004-07-22-DSC_0007.jpg';
+        $size = 10000;
+
+        $res = wp_remote_request( $url, array( 'timeout' => 30, 'limit_response_size' => $size ) );
+
+        $this->assertFalse( is_wp_error( $res ) );
+        $this->assertEquals( $size, strlen( $res['body'] ) );
+    }
+
+    /**
      * Test POST redirection methods
      *