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

HTTP API: Update Requests. 

Fixes an issue where you couldn't set a `Requests_Proxy_HTTP` object as a proxy setting.

See https://github.com/rmccue/Requests/pull/223.
See #37107, #33055.
Built from https://develop.svn.wordpress.org/trunk@38053


git-svn-id: http://core.svn.wordpress.org/trunk@37994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-07-13 15:44:29 +00:00
parent 2ecdbf36cb
commit 5f862c626a
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/class-requests.php
View File

@ -323,7 +323,7 @@ class Requests {
* for Basic authentication * for Basic authentication
* (Requests_Auth|array|boolean, default: false) * (Requests_Auth|array|boolean, default: false)
* - `proxy`: Proxy details to use for proxy by-passing and authentication * - `proxy`: Proxy details to use for proxy by-passing and authentication
* (Requests_Proxy|array|boolean, default: false) * (Requests_Proxy|array|string|boolean, default: false)
* - `max_bytes`: Limit for the response body size. * - `max_bytes`: Limit for the response body size.
* (integer|boolean, default: false) * (integer|boolean, default: false)
* - `idn`: Enable IDN parsing * - `idn`: Enable IDN parsing
@ -575,7 +575,7 @@ class Requests {
$options['auth']->register($options['hooks']); $options['auth']->register($options['hooks']);
} }
if (!empty($options['proxy'])) { if (is_string($options['proxy']) || is_array($options['proxy'])) {
$options['proxy'] = new Requests_Proxy_HTTP($options['proxy']); $options['proxy'] = new Requests_Proxy_HTTP($options['proxy']);
} }
if ($options['proxy'] !== false) { if ($options['proxy'] !== false) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-beta2-38052'; $wp_version = '4.6-beta2-38053';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.