Changeset 37694

Timestamp:

06/14/2016 05:29:58 AM (9 years ago)

Author:

rmccue

Message:

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.

Location:

trunk/src/wp-includes

Files:

• Requests/Transport/cURL.php (modified) (2 diffs)
• class-requests.php (modified) (1 diff)

trunk/src/wp-includes/Requests/Transport/cURL.php

@@ -177 +177 @@
         $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.
         curl_setopt($this->handle, CURLOPT_HEADERFUNCTION, null);
@@ -350 +350 @@
         }
 
-        if (is_int($options['timeout']) || $this->version < self::CURL_7_16_2) {
-            curl_setopt($this->handle, CURLOPT_TIMEOUT, ceil($options['timeout']));
+        // cURL requires a minimum timeout of 1 second when using the system
+        // 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 {
-            curl_setopt($this->handle, CURLOPT_TIMEOUT_MS, round($options['timeout'] * 1000));
+            curl_setopt($this->handle, CURLOPT_TIMEOUT_MS, round($timeout * 1000));
         }
 

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

@@ -305 +305 @@
      *
      * - `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)
      * - `connect_timeout`: How long should we wait while trying to connect?