Index: DefaultSettings.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/DefaultSettings.php,v
retrieving revision 1.158
diff -u -r1.158 DefaultSettings.php
--- DefaultSettings.php	31 Aug 2004 10:23:54 -0000	1.158
+++ DefaultSettings.php	2 Sep 2004 21:57:51 -0000
@@ -24,8 +24,12 @@
 if ( @$wgCommandLineMode ) {
 	$wgServer = $wgProto.'://localhost';
 } else {
-	$wgServer           = $wgProto.'://' . $_SERVER['SERVER_NAME'];
-	if( $_SERVER['SERVER_PORT'] != 80 ) $wgServer .= ":" . $_SERVER['SERVER_PORT'];
+	if (isset($_SERVER['HTTP_HOST'])) {
+		$wgServer           = $wgProto.'://' . $_SERVER['HTTP_HOST'];
+	} else {
+		$wgServer           = $wgProto.'://' . $_SERVER['SERVER_NAME'];
+		if( $_SERVER['SERVER_PORT'] != 80 ) $wgServer .= ":" . $_SERVER['SERVER_PORT'];
+	}
 }
 unset($wgProto);