From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 30 Jul 2008 20:14:52 +0000 (+0000)
Subject: Revert r38214 (IPv6 check for $wgServerName) -- failing to load IP class in some... 
X-Git-Tag: 1.31.0-rc.0~46268
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=8fb2d1401e317add4dad688eaf5e4f4dbab4f340;p=lhc%2Fweb%2Fwiklou.git

Revert r38214 (IPv6 check for $wgServerName) -- failing to load IP class in some situations as seen on Wikimedia live installation.
Haven't been able to reproduce locally, though.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f2a62091eb..4e7a41bde9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -45,8 +45,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14954) Fix regression in Modern and Simple skins
 * Recursion loop check added to Categoryfinder class
 * Fixed few performance troubles of large job queue processing
-* (bug 14977) Installations on servers using IPv6 addresses for $wgServer
-  were largely unusable because $wgServer didn't wrap the IP in brackets.
 
 === API changes in 1.14 ===
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e50f662b70..2cc0672eae 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -69,12 +69,6 @@ if( isset( $_SERVER['SERVER_NAME'] ) ) {
 	$wgServerName = 'localhost';
 }
 
-# Before we put http:// and other things onto it, need to 
-# wrap IPv6 in []. Bug 14977.
-if ( IP::isIPv6( $wgServerName ) ) {
-	$wgServerName = '[' . $wgServerName . ']';
-}
-
 # check if server use https:
 $wgProto = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';