com web/php: Missed the check for www.php.net /in addition to/ php.net. Thanks, bjori.: include/loadavg.inc
| From: | Daniel P. Brown | Date: | Wed, 05 Dec 2012 20:00:04 +0000 |
| Subject: | com web/php: Missed the check for www.php.net /in addition to/ php.net. Thanks, bjori.: include/loadavg.inc | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-15044@lists.php.net to get a copy of this message | ||
Commit: a06ff6c298a43e47dca04320a3c8aad89219a3f9
Author: Daniel P. Brown <danbrown@php.net> Wed, 5 Dec 2012 15:00:04 -0500
Parents: 3cc94915886c9918657f7fd0d82a84e72391d374
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=a06ff6c298a43e47dca04320a3c8aad89219a3f9
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 {