Fixed issue #8682: Force SSL fails when HTTPS not directly handled by…

… web server - patch by leexxx
LimeSurvey · Feb 7, 2014 · 0b4b2e8 · Shnoulle · Feb 7, 2014 · c-schmitz
1 parent fc74fd2
commit 0b4b2e8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -5849,7 +5849,9 @@ function SSLRedirect($enforceSSLMode)
 */
 function enforceSSLMode()
 {
-    $bSSLActive = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != "off");
+    $bSSLActive = ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != "off")||
+    $_SERVER['HTTP_FORWARDED_PROTO']=="https"||
+    $_SERVER['HTTP_X_FORWARDED_PROTO']=="https");
     if (Yii::app()->getConfig('ssl_emergency_override') !== true )
     {
         $force_ssl = strtolower(getGlobalSetting('force_ssl'));