WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-18 12:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

WP_Http: cURL: Use the parsed args $r, rather than the raw $args. Mentioned in #20219

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20207 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2012-03-18 03:12:12 +00:00
parent d37429e4c7
commit 5bc2f55d50
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class-http.php
View File

@ -1020,8 +1020,8 @@ class WP_Http_Curl {
} }
} }
$is_local = isset($args['local']) && $args['local']; $is_local = isset($r['local']) && $r['local'];
$ssl_verify = isset($args['sslverify']) && $args['sslverify']; $ssl_verify = isset($r['sslverify']) && $r['sslverify'];
if ( $is_local ) if ( $is_local )
$ssl_verify = apply_filters('https_local_ssl_verify', $ssl_verify); $ssl_verify = apply_filters('https_local_ssl_verify', $ssl_verify);
elseif ( ! $is_local ) elseif ( ! $is_local )
@ -1112,7 +1112,7 @@ class WP_Http_Curl {
$theBody = $theResponse; $theBody = $theResponse;
// If no response, and It's not a HEAD request with valid headers returned // If no response, and It's not a HEAD request with valid headers returned
if ( 0 == strlen($theResponse) && ('HEAD' != $args['method'] || empty($this->headers)) ) { if ( 0 == strlen($theResponse) && ('HEAD' != $r['method'] || empty($this->headers)) ) {
if ( $curl_error = curl_error($handle) ) if ( $curl_error = curl_error($handle) )
return new WP_Error('http_request_failed', $curl_error); 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) ) )