Changeset 5818e44 in github

Timestamp:

Oct 27, 2009 5:43:39 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

2cb5b5a

Parents:

d22f4e6

Message:

• Fix $_SERVERHTTPS? check for SSL forcing on IIS (#1486243) + fix port check

Files:

• CHANGELOG (modified) (1 diff)
• index.php (modified) (1 diff)
• program/include/main.inc (modified) (1 diff)
• program/include/rcube_shared.inc (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix $_SERVER['HTTPS'] check for SSL forcing on IIS (#1486243)
 - Avoid unnecessary page loads for selected tab (#1486032)
 - Fix quota indicator issues by content generation on client-size (#1486197, #1486220)

index.php

@@ -67 +67 @@
 if (empty($_SESSION['user_id']) && ($force_https = $RCMAIL->config->get('force_https', false))) {
   $https_port = is_bool($force_https) ? 443 : $force_https;
-  if (!(isset($_SERVER['HTTPS']) || $_SERVER['SERVER_PORT'] == $use_https || $RCMAIL->config->get('use_https'))) {
+  if (!rcube_https_check($https_port)) {
     header('Location: https://' . $_SERVER['HTTP_HOST'] . ($https_port != 443 ? ':' . $https_port : '') . $_SERVER['REQUEST_URI']);
     exit;

program/include/main.inc

@@ -1402 +1402 @@
 
 /**
+ * Check if working in SSL mode
+ *
+ * @param integer HTTPS port number
+ * @param boolean Enables 'use_https' option checking
+ */
+function rcube_https_check($port=null, $use_https=true)
+{
+  global $RCMAIL;
+  
+  if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')
+    return true;
+  if ($port && $_SERVER['SERVER_PORT'] == $port)
+    return true;
+  if ($use_https && $RCMAIL->config->get('use_https'))
+    return true;
+
+  return false;
+}
+
+
+/**
  * E-mail address validation
  */

program/include/rcube_shared.inc

@@ -42 +42 @@
   
   // We need to set the following headers to make downloads work using IE in HTTPS mode.
-  if (isset($_SERVER['HTTPS']) || rcmail::get_instance()->config->get('use_https')) {
+  if (rcube_https_check()) {
     header('Pragma: ');
     header('Cache-Control: ');