Support HTTP timeout detection in curl backend

We already do this for the pure-PHP backend, and it's easy to
catch this single error and pass a more specific message

Change-Id: I8a81dd90b691c35c51a19f8790f06578dd067613

diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index acf9baa..489a83a 100644 (file)
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -774,7 +774,10 @@ class CurlHttpRequest extends MWHttpRequest {
                        wfRestoreWarnings();
                }
 
-               if ( false === curl_exec( $curlHandle ) ) {
+               $curlRes = curl_exec( $curlHandle );
+               if ( curl_errno( $curlHandle ) == CURLE_OPERATION_TIMEOUTED ) {
+                       $this->status->fatal( 'http-timed-out', $this->url );
+               } elseif ( $curlRes === false ) {
                        $this->status->fatal( 'http-curl-error', curl_error( $curlHandle ) );
                } else {
                        $this->headerList = explode( "\r\n", $this->headerText );