# HG changeset patch
# User Franck Deroche <webmaster@defr.org>
# Date 1230039175 -3600
# Node ID 8e6257f3ae39de430edef4edd8444b77c2c1bdba
# Parent  8f09b8a89d76fb042e272cf167dadab4dcf68559
Drupal 6.8

diff -r 8f09b8a89d76 -r 8e6257f3ae39 CHANGELOG.txt
--- a/CHANGELOG.txt	Tue Dec 23 14:32:44 2008 +0100
+++ b/CHANGELOG.txt	Tue Dec 23 14:32:55 2008 +0100
@@ -1,4 +1,8 @@
-// $Id: CHANGELOG.txt,v 1.253.2.18 2008/12/10 22:30:13 goba Exp $
+// $Id: CHANGELOG.txt,v 1.253.2.20 2008/12/11 17:39:41 goba Exp $
+
+Drupal 6.8, 2008-12-11
+----------------------
+- Removed a previous change incompatible with PHP 5.1.x and lower.
 
 Drupal 6.7, 2008-12-10
 ----------------------
@@ -150,6 +154,10 @@
 - Removed old system updates. Updates from Drupal versions prior to 5.x will
   require upgrading to 5.x before upgrading to 6.x.
 
+Drupal 5.14, 2008-12-11
+----------------------
+- Removed a previous change incompatible with PHP 5.1.x and lower.
+
 Drupal 5.13, 2008-12-10
 -----------------------
 - fixed a variety of small bugs.
diff -r 8f09b8a89d76 -r 8e6257f3ae39 includes/common.inc
--- a/includes/common.inc	Tue Dec 23 14:32:44 2008 +0100
+++ b/includes/common.inc	Tue Dec 23 14:32:55 2008 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: common.inc,v 1.756.2.35 2008/12/10 22:30:13 goba Exp $
+// $Id: common.inc,v 1.756.2.37 2008/12/11 17:39:42 goba Exp $
 
 /**
  * @file
diff -r 8f09b8a89d76 -r 8e6257f3ae39 includes/session.inc
--- a/includes/session.inc	Tue Dec 23 14:32:44 2008 +0100
+++ b/includes/session.inc	Tue Dec 23 14:32:55 2008 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: session.inc,v 1.44.2.5 2008/12/08 14:42:30 goba Exp $
+// $Id: session.inc,v 1.44.2.6 2008/12/11 00:29:34 goba Exp $
 
 /**
  * @file
@@ -97,10 +97,6 @@
     setcookie(session_name(), '', time() - 42000, '/');
   }
 
-  extract(session_get_cookie_params());
-  // Set "httponly" to TRUE to reduce the risk of session stealing via XSS.
-  // This has no effect for PHP < 5.2.0.
-  session_set_cookie_params($lifetime, $path, $domain, $secure, TRUE);
   session_regenerate_id();
 
   db_query("UPDATE {sessions} SET sid = '%s' WHERE sid = '%s'", session_id(), $old_session_id);
diff -r 8f09b8a89d76 -r 8e6257f3ae39 modules/system/system.module
--- a/modules/system/system.module	Tue Dec 23 14:32:44 2008 +0100
+++ b/modules/system/system.module	Tue Dec 23 14:32:55 2008 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: system.module,v 1.585.2.24 2008/12/10 22:30:14 goba Exp $
+// $Id: system.module,v 1.585.2.26 2008/12/11 17:39:42 goba Exp $
 
 /**
  * @file
@@ -9,7 +9,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '6.7');
+define('VERSION', '6.8');
 
 /**
  * Core API compatibility.