Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.145.2.6
diff -u -p -r1.145.2.6 bootstrap.inc
--- includes/bootstrap.inc	26 Jul 2007 19:16:45 -0000	1.145.2.6
+++ includes/bootstrap.inc	24 Aug 2007 23:16:13 -0000
@@ -281,9 +281,16 @@ function conf_init() {
     $session_name = $cookie_domain;
   }
   else {
+    // If the site is using session.cookie_secure, use $base_url as
+    // session name.
+    if (ini_get('session.cookie_secure')) {
+      $session_name = $base_url;
+    }
     // Otherwise use $base_url as session name, without the protocol
     // to use the same session identifiers across http and https.
-    list( , $session_name) = explode('://', $base_url, 2);
+    else {
+      list( , $session_name) = explode('://', $base_url, 2);
+    }
     // We try to set the cookie domain to the hostname.
     // We escape the hostname because it can be modified by a visitor.
     if (!empty($_SERVER['HTTP_HOST'])) {