From eb5033ad6b4a12a32e1493fb5b9aeee9eb75f10e Mon Sep 17 00:00:00 2001
From: Michael Koziarski <michael@koziarski.com>
Date: Tue, 2 Oct 2007 05:58:16 +0000
Subject: Merge session fixation fixes from stable

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7722 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'actionpack/CHANGELOG')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 6816d18261..134ad1f898 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,3 +1,7 @@
+*SVN*
+
+* Only accept session ids from cookies, prevents session fixation attacks.  [bradediger] 
+
 *2.0.0 [Preview Release]* (September 29th, 2007) [Includes duplicates of changes from 1.12.2 - 1.13.3]
 
 * Fixed that render template did not honor exempt_from_layout #9698 [pezra]
-- 
cgit v1.2.3