Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #1313 from besstiolle/master

fix HTTPS/HTTP issue under Cherokee Webserver : https://github.com/blueimp/jQuery-File-Upload/issues/1312
  • Loading branch information...
commit cffd259c8e1ade8288f65866251c5521eb0a966c 2 parents 75d1117 + b05f58f
@blueimp authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 server/php/upload.class.php
View
4 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'], '/'));
}
Please sign in to comment.
Something went wrong with that request. Please try again.