From 731ebeea38bfdc282ef7d562d61bcd7d23c5099d Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Mon, 7 Jan 2019 18:25:59 -0800 Subject: [PATCH] Remove a CURLOPT_CONNECTTIMEOUT_MS check It was introduced in PHP 5.2.3. Change-Id: I0c7e1684038c98677ceefbcfbb78641e90713002 --- includes/http/CurlHttpRequest.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/includes/http/CurlHttpRequest.php b/includes/http/CurlHttpRequest.php index bab85216c0..8ef9cc226b 100644 --- a/includes/http/CurlHttpRequest.php +++ b/includes/http/CurlHttpRequest.php @@ -52,12 +52,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" ]; -- 2.20.1