diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2014-01-14 19:24:18 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2014-01-14 19:24:18 +0100 |
| commit | 224b22a051051f6c2e494c3a2fb4adb42898e2d1 (patch) | |
| tree | 85a41a4cf8533bf740ec4c8d3affce88414daa56 /includes/HttpFunctions.php | |
| parent | 9937b8e6d6a8b4517c04c143daaf9ebd42ce8ba0 (diff) | |
Update to MediaWiki 1.22.1
Diffstat (limited to 'includes/HttpFunctions.php')
| -rw-r--r-- | includes/HttpFunctions.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php index 78c2ac7a..fa2fc12b 100644 --- a/includes/HttpFunctions.php +++ b/includes/HttpFunctions.php @@ -730,7 +730,12 @@ class CurlHttpRequest extends MWHttpRequest { $this->curlOptions[CURLOPT_PROXY] = $this->proxy; $this->curlOptions[CURLOPT_TIMEOUT] = $this->timeout; - $this->curlOptions[CURLOPT_CONNECTTIMEOUT_MS] = $this->connectTimeout * 1000; + + // Only supported in curl >= 7.16.2 + if ( defined( 'CURLOPT_CONNECTTIMEOUT_MS' ) ) { + $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] = array( $this, "readHeader" ); |