Commit:    22e566cecab1b336e14afd748097814908934dd8
Author:    Daniel P. Brown <danbr...@php.net>         Wed, 5 Dec 2012 15:00:04 
-0500
Parents:   605317c0738c6067fc20fd6f39cf70aa88152b8f
Branches:  master

Link:       
http://git.php.net/?p=web/php.git;a=commitdiff;h=22e566cecab1b336e14afd748097814908934dd8

Log:
Missed the check for www.php.net /in addition to/ php.net.  Thanks, bjori.

Changed paths:
  M  include/loadavg.inc


Diff:
diff --git a/include/loadavg.inc b/include/loadavg.inc
index 0627833..6fa0dce 100644
--- a/include/loadavg.inc
+++ b/include/loadavg.inc
@@ -28,7 +28,7 @@ function load_check()
     // Adhere to user preferences if valid
     $user_mirror = myphpnet_mirror();
     if (isset($MIRRORS[$user_mirror]) && $MIRRORS[$user_mirror][7] == MIRROR_OK
-        && $user_mirror != "http://php.net/";) {
+        && $user_mirror != "http://php.net/"; && $user_mirror != 
'http://www.php.net/') {
         header("Location: $user_mirror" . substr($_SERVER['REQUEST_URI'], 1));
         exit;
     }
@@ -38,7 +38,7 @@ function load_check()
 
     // Find potential close mirrors 
     foreach ($MIRRORS as $murl => $mirror) {
-        if ($murl != 'http://php.net/' && $mirror[7] == MIRROR_OK && 
$mirror[4] != MIRROR_SPECIAL) {
+        if ($murl != 'http://php.net/' && $murl != 'http://www.php.net/' && 
$mirror[7] == MIRROR_OK && $mirror[4] != MIRROR_SPECIAL) {
             if ($mirror[0] == $COUNTRY) {
                 $close_mirrors[] = $murl;
             } else {


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to