Changeset 12472 for trunk/wp-includes/http.php

Timestamp:

12/21/2009 07:34:38 PM (15 years ago)

Author:

ryan

Message:

Don't use CURLOPT_CONNECTTIMEOUT_MS or CURLOPT_TIMEOUT_MS due to bugginess. fixes #11505 see #11499

File:

• trunk/wp-includes/http.php (modified) (1 diff)

trunk/wp-includes/http.php

@@ -1297 +1297 @@
         // 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 );
-        }
+        $timeout = (int) ceil( $r['timeout'] );
+        curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, $timeout );
+        curl_setopt( $handle, CURLOPT_TIMEOUT, $timeout );
 
         curl_setopt( $handle, CURLOPT_URL, $url);