X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=blobdiff_plain;f=includes%2Fhttp%2FCurlHttpRequest.php;h=5130e36fb5c2f65ec049b0575b04920fef0e51cc;hb=4ecf24c6e08edb31b0244229e8da8f9fa9c6068c;hp=bab85216c02262c977393259a37ce4cd2a44546d;hpb=fd08137ebf8b34cb1a9711c34d6c4d0357aea5b7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/http/CurlHttpRequest.php b/includes/http/CurlHttpRequest.php
index bab85216c0..5130e36fb5 100644
--- a/includes/http/CurlHttpRequest.php
+++ b/includes/http/CurlHttpRequest.php
@@ -27,6 +27,18 @@ class CurlHttpRequest extends MWHttpRequest {
 	protected $curlOptions = [];
 	protected $headerText = "";
 
+	/**
+	 * @throws RuntimeException
+	 */
+	public function __construct() {
+		if ( !function_exists( 'curl_init' ) ) {
+			throw new RuntimeException(
+				__METHOD__ . ': curl (https://www.php.net/curl) is not installed' );
+		}
+
+		parent::__construct( ...func_get_args() );
+	}
+
 	/**
 	 * @param resource $fh
 	 * @param string $content
@@ -52,12 +64,7 @@ class CurlHttpRequest extends MWHttpRequest {
 
 		$this->curlOptions[CURLOPT_PROXY] = $this->proxy;
 		$this->curlOptions[CURLOPT_TIMEOUT] = $this->timeout;
-
-		// Only supported in curl >= 7.16.2
-		if ( defined( 'CURLOPT_CONNECTTIMEOUT_MS' ) ) {
-			$this->curlOptions[CURLOPT_CONNECTTIMEOUT_MS] = $this->connectTimeout * 1000;
-		}
-
+		$this->curlOptions[CURLOPT_CONNECTTIMEOUT_MS] = $this->connectTimeout * 1000;
 		$this->curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
 		$this->curlOptions[CURLOPT_WRITEFUNCTION] = $this->callback;
 		$this->curlOptions[CURLOPT_HEADERFUNCTION] = [ $this, "readHeader" ];