mirror/php-tileserver
1
0
Fork 0
mirror of https://github.com/klokantech/tileserver-php.git synced 2025-08-02 04:30:23 +02:00
Code Issues Releases Wiki Activity

Merge pull request #100 from Burke9077/master

Browse Source 
Fixed issue if HTTP_X_FORWARDED_PROTO is unset.
This commit is contained in:
Dalibor Janák
2017-04-24 09:31:57 +02:00
committed by GitHub
parent 5f314fef28 dc2452e781
commit 380cfdeaaf
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tileserver.php
View File

@@ -65,7 +65,7 @@ class Server {
*/ */
public function __construct() { public function __construct() {
$this->config = $GLOBALS['config']; $this->config = $GLOBALS['config'];
//Get config from enviroment //Get config from enviroment
$envServerTitle = getenv('serverTitle'); $envServerTitle = getenv('serverTitle');
if($envServerTitle !== FALSE){ if($envServerTitle !== FALSE){
@@ -73,7 +73,7 @@ class Server {
} }
$envBaseUrls = getenv('baseUrls'); $envBaseUrls = getenv('baseUrls');
if($envBaseUrls !== FALSE){ if($envBaseUrls !== FALSE){
$this->config['baseUrls'] = is_array($envBaseUrls) ? $this->config['baseUrls'] = is_array($envBaseUrls) ?
$envBaseUrls : explode(',', $envBaseUrls); $envBaseUrls : explode(',', $envBaseUrls);
} }
$envTemplate = getenv('template'); $envTemplate = getenv('template');
@@ -1228,7 +1228,13 @@ class Router {
$request_method = strtolower($_SERVER['REQUEST_METHOD']); $request_method = strtolower($_SERVER['REQUEST_METHOD']);
$path_info = '/'; $path_info = '/';
global $config; global $config;
$config['protocol'] = ((isset($_SERVER['HTTPS']) or $_SERVER['SERVER_PORT'] == '443') or $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ? 'https' : 'http'; $xForwarded = false;
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
if ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
$xForwarded = true;
}
}
$config['protocol'] = ((isset($_SERVER['HTTPS']) or $_SERVER['SERVER_PORT'] == '443') or $xForwarded) ? 'https' : 'http';
if (!empty($_SERVER['PATH_INFO'])) { if (!empty($_SERVER['PATH_INFO'])) {
$path_info = $_SERVER['PATH_INFO']; $path_info = $_SERVER['PATH_INFO'];
} else if (!empty($_SERVER['ORIG_PATH_INFO']) && strpos($_SERVER['ORIG_PATH_INFO'], 'tileserver.php') === false) { } else if (!empty($_SERVER['ORIG_PATH_INFO']) && strpos($_SERVER['ORIG_PATH_INFO'], 'tileserver.php') === false) {