Changeset 12424

Timestamp:

12/17/2009 04:13:58 PM (15 years ago)

Author:

ryan

Message:

Properly handle float timeouts for all transports. Props mdawaffe. fixes #11468

File:

• trunk/wp-includes/http.php (modified) (7 diffs)

trunk/wp-includes/http.php

@@ -679 +679 @@
             return new WP_Error('http_request_failed', $iError . ': ' . $strError);
 
-        stream_set_timeout($handle, $r['timeout'] );
+        $timeout = (int) floor( $r['timeout'] );
+        $utimeout = $timeout == $r['timeout'] ? 0 : 1000000 * $r['timeout'] % 1000000;
+        stream_set_timeout( $handle, $timeout, $utimeout );
 
         if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) //Some proxies require full URL in this field.
@@ -835 +837 @@
             return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $url));
 
-        stream_set_timeout($handle, $r['timeout'] );
+        $timeout = (int) floor( $r['timeout'] );
+        $utimeout = $timeout == $r['timeout'] ? 0 : 1000000 * $r['timeout'] % 1000000;
+        stream_set_timeout( $handle, $timeout, $utimeout );
 
         if ( ! $r['blocking'] ) {
@@ -1008 +1012 @@
             return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $url));
 
-        // WordPress supports PHP 4.3, which has this function. Removed sanity checking for
-        // performance reasons.
-        stream_set_timeout($handle, $r['timeout'] );
+        $timeout = (int) floor( $r['timeout'] );
+        $utimeout = $timeout == $r['timeout'] ? 0 : 1000000 * $r['timeout'] % 1000000;
+        stream_set_timeout( $handle, $timeout, $utimeout );
 
         if ( ! $r['blocking'] ) {
@@ -1142 +1146 @@
             $ssl_verify = apply_filters('https_ssl_verify', $ssl_verify);
 
+        $r['timeout'] = (int) ceil( $r['timeout'] );
+
         $options = array(
             'timeout' => $r['timeout'],
@@ -1256 +1262 @@
         WP_Http::buildCookieHeader( $r );
 
-        // cURL extension will sometimes fail when the timeout is less than 1 as it may round down
-        // to 0, which gives it unlimited timeout.
-        if ( $r['timeout'] > 0 && $r['timeout'] < 1 )
-            $r['timeout'] = 1;
-
         $handle = curl_init();
 
@@ -1293 +1294 @@
             $ssl_verify = apply_filters('https_ssl_verify', $ssl_verify);
 
+
+        // CURLOPT_TIMEOUT and CURLOPT_CONNECTTIMEOUT expect integers.  Have to use ceil since
+        // a value of 0 will allow an ulimited timeout.
+        // Use _MS if available.
+        if ( defined( 'CURLOPT_TIMEOUT_MS' ) ) {
+            $timeout_ms = (int) ceil( 1000 * $r['timeout'] );
+            curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT_MS, $timeout_ms );
+            curl_setopt( $handle, CURLOPT_TIMEOUT_MS, $timeout_ms );
+        } else {
+            $timeout = (int) ceil( $r['timeout'] );
+            curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, $timeout );
+            curl_setopt( $handle, CURLOPT_TIMEOUT, $timeout );
+        }
+
         curl_setopt( $handle, CURLOPT_URL, $url);
         curl_setopt( $handle, CURLOPT_RETURNTRANSFER, true );
@@ -1298 +1313 @@
         curl_setopt( $handle, CURLOPT_SSL_VERIFYPEER, $ssl_verify );
         curl_setopt( $handle, CURLOPT_USERAGENT, $r['user-agent'] );
-        curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, $r['timeout'] );
-        curl_setopt( $handle, CURLOPT_TIMEOUT, $r['timeout'] );
         curl_setopt( $handle, CURLOPT_MAXREDIRS, $r['redirection'] );