Changeset 3096 in subversion

Timestamp:

Nov 4, 2009 2:22:17 AM (4 years ago)

Author:

alec

Message:

• fix HTTPS checking (#1486273)

Location:

trunk/roundcubemail/program/include

Files:

• iniset.php (modified) (1 diff)
• main.inc (modified) (1 diff)
• rcmail.php (modified) (1 diff)

trunk/roundcubemail/program/include/iniset.php

@@ -52 +52 @@
 
 ini_set('error_reporting', E_ALL&~E_NOTICE);
-if  (isset($_SERVER['HTTPS'])) {
-   ini_set('session.cookie_secure', ($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off'))?1:0);
+if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') {
+   ini_set('session.cookie_secure', 1);
 } else {
    ini_set('session.cookie_secure', 0);

trunk/roundcubemail/program/include/main.inc

@@ -1411 +1411 @@
   global $RCMAIL;
   
-  if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')
+  if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off')
     return true;
   if ($port && $_SERVER['SERVER_PORT'] == $port)

trunk/roundcubemail/program/include/rcmail.php

@@ -1064 +1064 @@
     $cookie = session_get_cookie_params();
     setcookie($name, $value, $exp, $cookie['path'], $cookie['domain'],
-      ($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off')));
+      rcube_https_check());
   }
 }