- Patch #151916 by JohnAlbin: fixing a double patch inclusion.

1 files changed, 0 insertions, 26 deletions

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 5e7591f2a..a2aa44742 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -253,32 +253,6 @@ function drupal_unset_globals() {
       }
     }
   }
-
-  if ($cookie_domain) {
-    // If the user specifies the cookie domain, also use it for session name.
-    $session_name = $cookie_domain;
-  }
-  else {
-    // Otherwise use $base_url for session name.
-    $session_name = $base_url;
-    // We try to set the cookie domain to the hostname.
-    if (!empty($_SERVER['HTTP_HOST'])) {
-      $cookie_domain = $_SERVER['HTTP_HOST'];
-    }
-  }
-  // Strip leading periods, www., and port numbers from cookie domain.
-  $cookie_domain = ltrim($cookie_domain, '.');
-  if (strpos($cookie_domain, 'www.') === 0) {
-    $cookie_domain = substr($cookie_domain, 4);
-  }
-  $cookie_domain = explode(':', $cookie_domain);
-  $cookie_domain = '.'. array_shift($cookie_domain);
-  // Per RFC 2109, cookie domains must contain at least one dot other than the
-  // first. For hosts such as 'localhost' or IP Addresses we don't set a cookie domain.
-  if (count(explode('.', $cookie_domain)) > 2 && !is_numeric(str_replace('.', '', $cookie_domain))) {
-    ini_set('session.cookie_domain', $cookie_domain);
-  }
-  session_name('SESS'. md5($session_name));
 }
 
 /**