Changeset 38053

Timestamp:

07/13/2016 03:43:02 PM (7 years ago)

Author:

ocean90

Message:

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.

File:

• trunk/src/wp-includes/class-requests.php (modified) (2 diffs)

trunk/src/wp-includes/class-requests.php

@@ -324 +324 @@
      *    (Requests_Auth|array|boolean, default: false)
      * - `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.
      *    (integer|boolean, default: false)
@@ -576 +576 @@
         }
 
-        if (!empty($options['proxy'])) {
+        if (is_string($options['proxy']) || is_array($options['proxy'])) {
             $options['proxy'] = new Requests_Proxy_HTTP($options['proxy']);
         }