From 0edd6983ba69e8195fa7cade96eca27df9ebf237 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Tue, 5 Mar 2013 09:06:02 +0100 Subject: Update to MediaWiki 1.20.3 --- includes/HttpFunctions.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'includes/HttpFunctions.php') 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; -- cgit v1.2.2