diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2013-03-05 09:06:02 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2013-03-05 09:06:02 +0100 |
| commit | 0edd6983ba69e8195fa7cade96eca27df9ebf237 (patch) | |
| tree | e0a5a8ee7fac4c7ce9d308419d13dbca13a7a609 /includes/HttpFunctions.php | |
| parent | 8ef4b96a9b23b2cfc0eed4da0d6d324da9f9da2f (diff) | |
Update to MediaWiki 1.20.3
Diffstat (limited to 'includes/HttpFunctions.php')
| -rw-r--r-- | includes/HttpFunctions.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php index 8453e62c..8e48da46 100644 --- a/includes/HttpFunctions.php +++ b/includes/HttpFunctions.php @@ -716,13 +716,8 @@ class CurlHttpRequest extends MWHttpRequest { } $this->curlOptions[CURLOPT_USERAGENT] = $this->reqHeaders['User-Agent']; - if ( isset( $this->sslVerifyHost ) ) { - $this->curlOptions[CURLOPT_SSL_VERIFYHOST] = $this->sslVerifyHost; - } - - if ( isset( $this->sslVerifyCert ) ) { - $this->curlOptions[CURLOPT_SSL_VERIFYPEER] = $this->sslVerifyCert; - } + $this->curlOptions[CURLOPT_SSL_VERIFYHOST] = $this->sslVerifyHost ? 2 : 0; + $this->curlOptions[CURLOPT_SSL_VERIFYPEER] = $this->sslVerifyCert; if ( $this->caInfo ) { $this->curlOptions[CURLOPT_CAINFO] = $this->caInfo; |