From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 4 Apr 2013 00:08:20 +0000 (+0000)
Subject: Merge "Remove non-functional handling of curl_error()"
X-Git-Tag: 1.31.0-rc.0~20108
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=38a79a01f48f69eab6e7be029c600f02ed882feb;hp=9f1bca77eb6b71576ef21682d10804a0a00e7929;p=lhc%2Fweb%2Fwiklou.git

Merge "Remove non-functional handling of curl_error()"
---

diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 4730a973fe..285cdac6c9 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -696,11 +696,6 @@ class MWHttpRequest {
 class CurlHttpRequest extends MWHttpRequest {
 	const SUPPORTS_FILE_POSTS = true;
 
-	static $curlMessageMap = array(
-		6 => 'http-host-unreachable',
-		28 => 'http-timed-out'
-	);
-
 	protected $curlOptions = array();
 	protected $headerText = "";
 
@@ -780,13 +775,7 @@ class CurlHttpRequest extends MWHttpRequest {
 		}
 
 		if ( false === curl_exec( $curlHandle ) ) {
-			$code = curl_error( $curlHandle );
-
-			if ( isset( self::$curlMessageMap[$code] ) ) {
-				$this->status->fatal( self::$curlMessageMap[$code] );
-			} else {
-				$this->status->fatal( 'http-curl-error', curl_error( $curlHandle ) );
-			}
+			$this->status->fatal( 'http-curl-error', curl_error( $curlHandle ) );
 		} else {
 			$this->headerList = explode( "\r\n", $this->headerText );
 		}
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 44b6cc9477..8365dcb131 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2397,7 +2397,6 @@ For optimal security, img_auth.php is disabled.',
 'http-read-error'       => 'HTTP read error.',
 'http-timed-out'        => 'HTTP request timed out.',
 'http-curl-error'       => 'Error fetching URL: $1',
-'http-host-unreachable' => 'Could not reach URL.',
 'http-bad-status'       => 'There was a problem during the HTTP request: $1 $2',
 
 # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 9c883bf11e..8361b1b343 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1480,7 +1480,6 @@ $wgMessageStructure = array(
 		'http-read-error',
 		'http-timed-out',
 		'http-curl-error',
-		'http-host-unreachable',
 		'http-bad-status',
 	),