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

bjori · bjori · commit 70a4a7f3867f · 2013-12-22T11:35:13.000-08:00
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ if (!isset($_SERVER["HTTPS"]) \|\| $_SERVER["HTTPS"] != "on") {`
`500`	`500`	`$proto = "https";`
`501`	`501`	`}`
`502`	`502`
`503`		`-if($_SERVER["SERVER_PORT"] != '80' \|\| $_SERVER["SERVER_PORT"] != 443) {`
	`503`	`+if($_SERVER["SERVER_PORT"] != '80' && $_SERVER["SERVER_PORT"] != 443) {`
`504`	`504`	`$MYSITE = $proto . '://' . $_SERVER["SERVER_NAME"] . ':' . (int)$_SERVER["SERVER_PORT"] . '/';`
`505`	`505`	`$msite = 'http://' . $_SERVER["SERVER_NAME"] . ':' . (int)$_SERVER["SERVER_PORT"] . '/';`
`506`	`506`	`} else {`