diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index 66825e14a..85baab58c 100644 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -160,7 +160,13 @@ try { define('SERVER_NAME', $SERVER_INFO['SERVER_NAME']); define('SERVER_PORT', $SERVER_INFO['SERVER_PORT']); - define('REQUEST_SCHEME', $SERVER_INFO['REQUEST_SCHEME']); + //to do improvement G::is_https() + if ((isset($SERVER_INFO['HTTPS']) && $SERVER_INFO['HTTPS'] == 'on') || + (isset($SERVER_INFO['HTTP_X_FORWARDED_PROTO']) && $SERVER_INFO['HTTP_X_FORWARDED_PROTO'] == 'https')) { + define('REQUEST_SCHEME', 'https'); + } else { + define('REQUEST_SCHEME', $SERVER_INFO['REQUEST_SCHEME']); + } } else { eprintln('WARNING! No server info found!', 'red'); } diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php index 992f0ac40..39977faca 100644 --- a/workflow/engine/classes/model/AppDelegation.php +++ b/workflow/engine/classes/model/AppDelegation.php @@ -223,7 +223,6 @@ class AppDelegation extends BaseAppDelegation try { $res = $this->save(); } catch (PropelException $e) { - error_log($e->getMessage()); return; } } else { diff --git a/workflow/engine/src/ProcessMaker/Core/System.php b/workflow/engine/src/ProcessMaker/Core/System.php index d846a9cc5..ae37dea92 100644 --- a/workflow/engine/src/ProcessMaker/Core/System.php +++ b/workflow/engine/src/ProcessMaker/Core/System.php @@ -1578,7 +1578,7 @@ class System public static function getServerHost() { $port = self::getServerPort(); - if (!empty($port) && $port != '80') { + if (!empty($port) && $port != '80' && $port != '443') { return self::getServerHostname() . ':' . $port; } return self::getServerHostname();