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. 

This introduces a minimum value of 1 second for timeouts passed to cURL.

Internally, cURL uses alarm() for interrupts, which accepts a second-resolution timeout. Any values lower than 1 second are instantly failed rather than being rounded upwards. While this makes the experience worse for those using asynchronous DNS lookups, there's no way to detect which DNS resolver is being used from PHP.

See #33055, #8923.

Built from https://develop.svn.wordpress.org/trunk@37694


git-svn-id: http://core.svn.wordpress.org/trunk@37660 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan McCue 2016-06-14 05:30:28 +00:00
parent 3808a6bebb
commit b8b7a00889
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,7 @@ class Requests_Transport_cURL implements Requests_Transport {
$this->process_response($response, $options); $this->process_response($response, $options);
// Need to remove the $this reference from the curl handle. // Need to remove the $this reference from the curl handle.
// Otherwise Requests_Transport_cURL wont be garbage collected and the curl_close() will never be called. // Otherwise Requests_Transport_cURL wont be garbage collected and the curl_close() will never be called.
curl_setopt($this->handle, CURLOPT_HEADERFUNCTION, null); curl_setopt($this->handle, CURLOPT_HEADERFUNCTION, null);
curl_setopt($this->handle, CURLOPT_WRITEFUNCTION, null); curl_setopt($this->handle, CURLOPT_WRITEFUNCTION, null);
@ -349,11 +349,19 @@ class Requests_Transport_cURL implements Requests_Transport {
break; break;
} }
if (is_int($options['timeout']) || $this->version < self::CURL_7_16_2) { // cURL requires a minimum timeout of 1 second when using the system
curl_setopt($this->handle, CURLOPT_TIMEOUT, ceil($options['timeout'])); // DNS resolver, as it uses `alarm()`, which is second resolution only.
// There's no way to detect which DNS resolver is being used from our
// end, so we need to round up regardless of the supplied timeout.
//
// https://github.com/curl/curl/blob/4f45240bc84a9aa648c8f7243be7b79e9f9323a5/lib/hostip.c#L606-L609
$timeout = max($options['timeout'], 1);
if (is_int($timeout) || $this->version < self::CURL_7_16_2) {
curl_setopt($this->handle, CURLOPT_TIMEOUT, ceil($timeout));
} }
else { else {
curl_setopt($this->handle, CURLOPT_TIMEOUT_MS, round($options['timeout'] * 1000)); curl_setopt($this->handle, CURLOPT_TIMEOUT_MS, round($timeout * 1000));
} }
if (is_int($options['connect_timeout']) || $this->version < self::CURL_7_16_2) { if (is_int($options['connect_timeout']) || $this->version < self::CURL_7_16_2) {

2
wp-includes/class-requests.php
View File

@ -304,6 +304,8 @@ class Requests {
* options: * options:
* *
* - `timeout`: How long should we wait for a response? * - `timeout`: How long should we wait for a response?
* Note: for cURL, a minimum of 1 second applies, as DNS resolution
* operates at second-resolution only.
* (float, seconds with a millisecond precision, default: 10, example: 0.01) * (float, seconds with a millisecond precision, default: 10, example: 0.01)
* - `connect_timeout`: How long should we wait while trying to connect? * - `connect_timeout`: How long should we wait while trying to connect?
* (float, seconds with a millisecond precision, default: 10, example: 0.01) * (float, seconds with a millisecond precision, default: 10, example: 0.01)

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-alpha-37693'; $wp_version = '4.6-alpha-37694';
/** /**
* 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.