sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Fixes #31172


git-svn-id: https://develop.svn.wordpress.org/trunk@31290 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2015-01-29 03:57:42 +00:00
parent 465e66e2cd
commit db3a49f8c8
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wp-includes/class-http.php
View File

@ -1520,10 +1520,16 @@ class WP_Http_Curl {
// 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 {
if ( $curl_error = curl_error( $handle ) ) {

16
tests/phpunit/tests/http/base.php
View File

@ -215,6 +215,22 @@ abstract class WP_HTTP_UnitTestCase extends WP_UnitTestCase {
}
/**
* 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
*