From ff91b9aed009e0a121c53874ad3f4021784abcff Mon Sep 17 00:00:00 2001
From: Drak <drak@zikula.org>
Date: Sat, 14 Jul 2012 18:24:10 +0100
Subject: [PATCH 1/2] [FrameworkBundle] Make FlashBag the default.

This makes the full stack framework ESI compatible.
---
 src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
index 871ea3ab9c..a89cf9a173 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
@@ -6,7 +6,7 @@
 
     <parameters>
         <parameter key="session.class">Symfony\Component\HttpFoundation\Session\Session</parameter>
-        <parameter key="session.flashbag.class">Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag</parameter>
+        <parameter key="session.flashbag.class">Symfony\Component\HttpFoundation\Session\Flash\FlashBag</parameter>
         <parameter key="session.attribute_bag.class">Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag</parameter>
         <parameter key="session.storage.native.class">Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage</parameter>
         <parameter key="session.storage.mock_file.class">Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage</parameter>

From 5ae0da015df7d0cb529823223024958ffa6acf52 Mon Sep 17 00:00:00 2001
From: Drak <drak@zikula.org>
Date: Sat, 14 Jul 2012 22:43:03 +0100
Subject: [PATCH 2/2] Update changelogs

---
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md   | 5 ++++-
 src/Symfony/Component/HttpFoundation/CHANGELOG.md | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 16039c92ee..986ca4f478 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -36,5 +36,8 @@ CHANGELOG
    start on demand.
  * [BC BREAK] TemplateNameParser::parseFromFilename() has been moved to a dedicated
    parser: TemplateFilenameParser::parse().
- * [BC BREAK] Kernel parameters are replaced by their value whereever they appear
+ * [BC BREAK] Kernel parameters are replaced by their value wherever they appear
    in Route patterns, requirements and defaults. Use '%%' as the escaped value for '%'.
+ * [BC BREAK] Switched behavior of flash messages to expire flash messages on retrieval
+   using Symfony\Component\HttpFoundation\Session\Flash\FlashBag as opposed to on
+   next pageload regardless of whether they are displayed or not.
\ No newline at end of file
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index 94f64815fb..4a00207e67 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -54,8 +54,8 @@ CHANGELOG
  * Added `FlashBag`. Flashes expire when retrieved by `get()` or `all()`. This
    implementation is ESI compatible.
  * Added `AutoExpireFlashBag` (default) to replicate Symfony 2.0.x auto expire
-   behaviour of messages auto expiring.
-   after one page page load.  Messages must be retrieved by `get()` or `all()`.
+   behaviour of messages auto expiring after one page page load.  Messages must
+   be retrieved by `get()` or `all()`.
  * Added `Symfony\Component\HttpFoundation\Attribute\AttributeBag` to replicate
    attributes storage behaviour from 2.0.x (default).
  * Added `Symfony\Component\HttpFoundation\Attribute\NamespacedAttributeBag` for