Changeset 52 for tags/1.0.0/lib/App.inc.php

Timestamp:

Jan 22, 2006 1:10:59 AM (18 years ago)

Author:

scdev

Message:

 

File:

• tags/1.0.0/lib/App.inc.php (modified) (1 diff)

tags/1.0.0/lib/App.inc.php

@@ -585 +585 @@
     global $CFG;
 
-    if ('on' != getenv('HTTPS') && $CFG->ssl_enabled && preg_match('/mod_ssl/i', getenv('SERVER_SOFTWARE'))) {
+    if (function_exists('apache_get_modules')) {
+        $modules = apache_get_modules();
+    } else {
+        // It's safe to assume we have mod_ssl if we can't determine otherwise.
+        $modules = array('mod_ssl');
+    }
+    
+    if ('on' != getenv('HTTPS') && $CFG->ssl_enabled && in_array('mod_ssl', $modules)) {
         raiseMsg(sprintf(_("Secure SSL connection made to %s"), $CFG->ssl_domain), MSG_NOTICE, __FILE__, __LINE__);
         // Always append session because some browsers do not send cookie when crossing to SSL URL.