Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Requests: Update to Requests master (fb5b517) which corrects a logic inversion in the cURL transport checks. 

Previously if a host had only disabled one of `curl_init()` or `curl_exec()` it wouldn't get detected correctly by Requests, which caused cURL warnings for users on an affected host.

Merge of [38274] to the 4.6 branch.

Fixes #37700.
Built from https://develop.svn.wordpress.org/branches/4.6@38338


git-svn-id: http://core.svn.wordpress.org/branches/4.6@38279 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Pascal Birchler 2016-08-23 15:55:31 +00:00
parent 873999207d
commit 3fd7c7eba1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/Requests/Transport/cURL.php
View File

@ -347,7 +347,7 @@ class Requests_Transport_cURL implements Requests_Transport {
default:
curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
if (!empty($data)) {
curl_setopt( $this->handle, CURLOPT_POSTFIELDS, $data );
curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
}
}
@ -524,7 +524,7 @@ class Requests_Transport_cURL implements Requests_Transport {
* @return boolean True if the transport is valid, false otherwise.
*/
public static function test($capabilities = array()) {
if (!function_exists('curl_init') && !function_exists('curl_exec')) {
if (!function_exists('curl_init') || !function_exists('curl_exec')) {
return false;
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6.1-alpha-38287';
$wp_version = '4.6.1-alpha-38338';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.