Commit:    70a4a7f3867fbbb95cf6d996e3c1dfb314688473
Author:    Hannes Magnusson <[email protected]>         Sun, 22 Dec 2013 
11:34:30 -0800
Parents:   a38398f82ecbebf16f0ce924fbdb7735a0b814c5
Branches:  master

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

Log:
Fixed bug #66336 Endless redirect loop on /git-php.php

Bugs:
https://bugs.php.net/66336

Changed paths:
  M  include/site.inc


Diff:
diff --git a/include/site.inc b/include/site.inc
index 11421eb..b7a0bb4 100644
--- a/include/site.inc
+++ b/include/site.inc
@@ -500,7 +500,7 @@ if (!isset($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != "on") 
{
     $proto = "https";
 }
 
-if($_SERVER["SERVER_PORT"] != '80' || $_SERVER["SERVER_PORT"] != 443) {
+if($_SERVER["SERVER_PORT"] != '80' && $_SERVER["SERVER_PORT"] != 443) {
     $MYSITE = $proto . '://' . $_SERVER["SERVER_NAME"] . ':' . 
(int)$_SERVER["SERVER_PORT"] . '/';
     $msite  =      'http://' . $_SERVER["SERVER_NAME"] . ':' . 
(int)$_SERVER["SERVER_PORT"] . '/';
 } else {


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

Reply via email to