fix HTTPS/HTTP issue under Cherokee Webserver : blueimp#1312

besstiolle · besstiolle · commit b05f58fa0214 · 2012-05-22T16:23:03.000+03:00
diff --git a/server/php/upload.class.php b/server/php/upload.class.php
@@ -67,10 +67,10 @@ function __construct($options=null) {
 
     protected function getFullUrl() {
       	return
-    		(isset($_SERVER['HTTPS']) ? 'https://' : 'http://').
+    		((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') ? 'https://' : 'http://').
     		(isset($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'].'@' : '').
     		(isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ($_SERVER['SERVER_NAME'].
-    		(isset($_SERVER['HTTPS']) && $_SERVER['SERVER_PORT'] === 443 ||
+    		(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' && $_SERVER['SERVER_PORT'] === 443 ||
     		$_SERVER['SERVER_PORT'] === 80 ? '' : ':'.$_SERVER['SERVER_PORT']))).
     		substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/'));
     }
