From 9390a8b3fcd86901cb509c1678337c90715d37f2 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Sat, 5 Oct 2013 11:52:13 +0200
Subject: [PATCH 01/15] start using symfony 2 reverse proxy

---
 .../Core/HttpKernel/HttpCache/HttpCache.php   | 52 +++++++++++++++++++
 core/lib/Thelia/Core/Thelia.php               |  1 +
 web/index.php                                 |  3 +-
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php

diff --git a/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php b/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php
new file mode 100644
index 000000000..01ad22733
--- /dev/null
+++ b/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php
@@ -0,0 +1,52 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\HttpKernel\HttpCache;
+
+use Symfony\Component\HttpKernel\HttpCache\Esi;
+use Symfony\Component\HttpKernel\HttpCache\HttpCache as BaseHttpCache;
+use Symfony\Component\HttpKernel\HttpCache\Store;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+/**
+ * Class HttpCache
+ * @package Thelia\Core\HttpKernel\HttpCache
+ * @author manuel raynaud <mraynaud@openstudio.fr>
+ */
+class HttpCache extends BaseHttpCache
+{
+
+    public function __construct(HttpKernelInterface $kernel, $options = array())
+    {
+        parent::__construct(
+            $kernel,
+            new Store($kernel->getCacheDir().'/http_cache'),
+            new Esi(),
+            array_merge(
+                array('debug' => $kernel->isDebug()),
+                $options
+            )
+        );
+    }
+
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index 199a0bb0b..cb20bca3f 100755
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -64,6 +64,7 @@ class Thelia extends Kernel
         if ($this->debug) {
             ini_set('display_errors', 1);
         }
+        ini_set('display_errors', 1);
         $this->initPropel();
     }
 
diff --git a/web/index.php b/web/index.php
index 4d50cc633..378bf1430 100755
--- a/web/index.php
+++ b/web/index.php
@@ -1,4 +1,5 @@
 <?php
+use Thelia\Core\HttpKernel\HttpCache\HttpCache;
 use Thelia\Core\Thelia;
 use Thelia\Core\HttpFoundation\Request;
 
@@ -10,7 +11,7 @@ require __DIR__ . '/../core/bootstrap.php';
 $request = Request::createFromGlobals();
 
 $thelia = new Thelia("prod", false);
-
+//$thelia = new HttpCache($thelia);
 $response = $thelia->handle($request)->prepare($request)->send();
 
 $thelia->terminate($request, $response);

From 64a8aeeb3303df5b9e0ca1a3586fbbfee4e46a59 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Sun, 6 Oct 2013 10:49:57 +0200
Subject: [PATCH 02/15] add httpcache into index_dev.php file

---
 local/cache/.gitkeep | 0
 web/index_dev.php    | 2 ++
 2 files changed, 2 insertions(+)
 delete mode 100755 local/cache/.gitkeep

diff --git a/local/cache/.gitkeep b/local/cache/.gitkeep
deleted file mode 100755
index e69de29bb..000000000
diff --git a/web/index_dev.php b/web/index_dev.php
index f653270d6..a89edaf7a 100755
--- a/web/index_dev.php
+++ b/web/index_dev.php
@@ -25,6 +25,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Thelia\Core\Thelia;
 use Thelia\Core\HttpFoundation\Request;
+use Thelia\Core\HttpKernel\HttpCache\HttpCache;
 
 //use Symfony\Component\DependencyInjection;
 
@@ -45,6 +46,7 @@ if ( false === in_array($request->getClientIp(), $trustedIp)) {
     $response = Response::create('Forbidden', 403)->send();
     $thelia->terminate($request, $response);
 } else {
+    //$thelia = new HttpCache($thelia);
     $response = $thelia->handle($request)->prepare($request)->send();
     $thelia->terminate($request, $response);
 }

From c1ab54bd4e57639f802443261507736013e45f18 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Sun, 6 Oct 2013 19:30:58 +0200
Subject: [PATCH 03/15] tweak httpFoundation cache part for compatibility with
 Thelia\HttpFoundation part

---
 .../Thelia/Command/ModuleActivateCommand.php  |  2 -
 core/lib/Thelia/Config/Resources/config.xml   |  4 +-
 .../Core/EventListener/ResponseListener.php   | 76 +++++++++++++++++++
 .../Core/HttpKernel/HttpCache/HttpCache.php   | 21 ++++-
 core/lib/Thelia/Core/TheliaHttpKernel.php     | 42 +++++-----
 web/index_dev.php                             |  7 +-
 6 files changed, 128 insertions(+), 24 deletions(-)
 create mode 100644 core/lib/Thelia/Core/EventListener/ResponseListener.php

diff --git a/core/lib/Thelia/Command/ModuleActivateCommand.php b/core/lib/Thelia/Command/ModuleActivateCommand.php
index d5ca8156d..cea8f8251 100755
--- a/core/lib/Thelia/Command/ModuleActivateCommand.php
+++ b/core/lib/Thelia/Command/ModuleActivateCommand.php
@@ -64,8 +64,6 @@ class ModuleActivateCommand extends BaseModuleGenerate
         }
 
         try {
-            new \TheliaDebugBar\TheliaDebugBar();
-
             $moduleReflection = new \ReflectionClass($module->getFullNamespace());
 
             $moduleInstance = $moduleReflection->newInstance();
diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index d4d63ac77..305f20c70 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -319,7 +319,9 @@
             <argument type="service" id="event_dispatcher"/>
         </service>
 
-
+        <service id="thelia.response.listener" class="Thelia\Core\EventListener\ResponseListener">
+            <tag name="kernel.event_subscriber"/>
+        </service>
     </services>
 
 </config>
diff --git a/core/lib/Thelia/Core/EventListener/ResponseListener.php b/core/lib/Thelia/Core/EventListener/ResponseListener.php
new file mode 100644
index 000000000..eb03bde81
--- /dev/null
+++ b/core/lib/Thelia/Core/EventListener/ResponseListener.php
@@ -0,0 +1,76 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\EventListener;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+
+/**
+ * Class ResponseListener
+ * @package Thelia\Core\EventListener
+ * @author manuel raynaud <mraynaud@openstudio.fr>
+ */
+class ResponseListener implements EventSubscriberInterface
+{
+
+    public function onResponse(FilterResponseEvent $event)
+    {
+        $request = $event->getRequest();
+
+        if($request->headers->has('Surrogate-Capability'))
+        {
+            $response = $event->getResponse();
+            $response->headers->set('Surrogate-Control', 'content="ESI/1.0"');
+            $event->setResponse($response);
+        }
+    }
+
+    /**
+     * Returns an array of event names this subscriber wants to listen to.
+     *
+     * The array keys are event names and the value can be:
+     *
+     *  * The method name to call (priority defaults to 0)
+     *  * An array composed of the method name to call and the priority
+     *  * An array of arrays composed of the method names to call and respective
+     *    priorities, or 0 if unset
+     *
+     * For instance:
+     *
+     *  * array('eventName' => 'methodName')
+     *  * array('eventName' => array('methodName', $priority))
+     *  * array('eventName' => array(array('methodName1', $priority), array('methodName2'))
+     *
+     * @return array The event names to listen to
+     *
+     * @api
+     */
+    public static function getSubscribedEvents()
+    {
+        return array(
+            KernelEvents::RESPONSE => array('onResponse', 0)
+        );
+    }
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php b/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php
index 01ad22733..b45f0f812 100644
--- a/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php
+++ b/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php
@@ -23,17 +23,20 @@
 
 namespace Thelia\Core\HttpKernel\HttpCache;
 
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpCache\Esi;
 use Symfony\Component\HttpKernel\HttpCache\HttpCache as BaseHttpCache;
 use Symfony\Component\HttpKernel\HttpCache\Store;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
+use Thelia\Core\HttpFoundation\Request as TheliaRequest;
+
 /**
  * Class HttpCache
  * @package Thelia\Core\HttpKernel\HttpCache
  * @author manuel raynaud <mraynaud@openstudio.fr>
  */
-class HttpCache extends BaseHttpCache
+class HttpCache extends BaseHttpCache implements HttpKernelInterface
 {
 
     public function __construct(HttpKernelInterface $kernel, $options = array())
@@ -49,4 +52,20 @@ class HttpCache extends BaseHttpCache
         );
     }
 
+    public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
+    {
+        if (!($request instanceof \Thelia\Core\HttpFoundation\Request)) {
+            $request = TheliaRequest::create(
+                $request->getUri(),
+                $request->getMethod(),
+                $request->getMethod() == 'GET' ? $request->query->all() : $request->request->all(),
+                $request->cookies->all(),
+                $request->files->all(),
+                $request->server->all(),
+                $request->getContent()
+            );
+        }
+        return parent::handle($request, $type, $catch);
+    }
+
 }
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/TheliaHttpKernel.php b/core/lib/Thelia/Core/TheliaHttpKernel.php
index 07dc15eed..73f3a0c0b 100755
--- a/core/lib/Thelia/Core/TheliaHttpKernel.php
+++ b/core/lib/Thelia/Core/TheliaHttpKernel.php
@@ -43,6 +43,7 @@ use Thelia\Model;
 
 class TheliaHttpKernel extends HttpKernel
 {
+    protected static $session;
 
     protected $container;
 
@@ -79,8 +80,11 @@ class TheliaHttpKernel extends HttpKernel
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
         //$request->headers->set('X-Php-Ob-Level', ob_get_level());
-        $request = $this->initSession($request);
-        $this->initParam($request);
+        if ($type == HttpKernelInterface::MASTER_REQUEST) {
+            $request = $this->initSession($request);
+            $this->initParam($request);
+        }
+
         $this->container->enterScope('request');
         $this->container->set('request', $request, 'request');
 
@@ -211,28 +215,32 @@ class TheliaHttpKernel extends HttpKernel
 
     protected function initSession(Request $request)
     {
+        if(null === self::$session) {
+            $storage = new Session\Storage\NativeSessionStorage();
 
-        $storage = new Session\Storage\NativeSessionStorage();
+            if (Model\ConfigQuery::read("session_config.default")) {
+                $storage->setSaveHandler(new Session\Storage\Handler\NativeFileSessionHandler(Model\ConfigQuery::read("session_config.save_path", THELIA_ROOT . '/local/session/')));
+            } else {
+                $handlerString = Model\ConfigQuery::read("session_config.handlers", 'Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler');
 
-        if (Model\ConfigQuery::read("session_config.default")) {
-            $storage->setSaveHandler(new Session\Storage\Handler\NativeFileSessionHandler(Model\ConfigQuery::read("session_config.save_path", THELIA_ROOT . '/local/session/')));
+                $handler = new $handlerString;
+
+                $storage->setSaveHandler($handler);
+            }
+
+            if (Model\ConfigQuery::read("session_config.config", null)) {
+                $storage->setOptions(json_decode(Model\ConfigQuery::read("session_config.config")));
+            }
+
+            self::$session = $session = new \Thelia\Core\HttpFoundation\Session\Session($storage);
         } else {
-            $handlerString = Model\ConfigQuery::read("session_config.handlers", 'Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler');
-
-            $handler = new $handlerString;
-
-            $storage->setSaveHandler($handler);
+            $session = self::$session;
         }
 
-        if (Model\ConfigQuery::read("session_config.config", null)) {
-           $storage->setOptions(json_decode(Model\ConfigQuery::read("session_config.config")));
-        }
-
-        $session = new \Thelia\Core\HttpFoundation\Session\Session($storage);
-        $session->start();
-
         $request->setSession($session);
 
+        $session->start();
+
         return $request;
     }
 }
diff --git a/web/index_dev.php b/web/index_dev.php
index a89edaf7a..bdbe56eef 100755
--- a/web/index_dev.php
+++ b/web/index_dev.php
@@ -46,9 +46,10 @@ if ( false === in_array($request->getClientIp(), $trustedIp)) {
     $response = Response::create('Forbidden', 403)->send();
     $thelia->terminate($request, $response);
 } else {
-    //$thelia = new HttpCache($thelia);
-    $response = $thelia->handle($request)->prepare($request)->send();
-    $thelia->terminate($request, $response);
+    $thelia = new HttpCache($thelia);
+    $response = $thelia->handle($request)->send();
+    //$thelia->terminate($request, $response);
+
 }
 
 

From 48319eeddebe4b27bfa5efaca9c4897ed35b1b68 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 20 Nov 2013 10:09:12 +0100
Subject: [PATCH 04/15] add new route for testing esi tag

---
 core/lib/Thelia/Core/EventListener/ViewListener.php | 4 ++--
 core/lib/Thelia/Core/Thelia.php                     | 1 -
 local/modules/Front/Config/front.xml                | 5 +++++
 local/modules/Front/Controller/CartController.php   | 6 ++++++
 templates/frontOffice/default/layout.tpl            | 2 +-
 web/index.php                                       | 2 +-
 web/index_dev.php                                   | 3 +--
 7 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/core/lib/Thelia/Core/EventListener/ViewListener.php b/core/lib/Thelia/Core/EventListener/ViewListener.php
index 4bdfd2195..4b1d3343a 100755
--- a/core/lib/Thelia/Core/EventListener/ViewListener.php
+++ b/core/lib/Thelia/Core/EventListener/ViewListener.php
@@ -90,13 +90,13 @@ class ViewListener implements EventSubscriberInterface
                 $response = new Response($content, $parser->getStatus() ?: 200);
             }
 
-/*            $response->setCache(array(
+            $response->setCache(array(
                 'last_modified' => new \DateTime(),
                 'max_age'       => 600,
                 's_maxage'      => 600,
                 'private'       => false,
                 'public'        => true,
-            ));*/
+            ));
 
             $event->setResponse($response);
         } catch (ResourceNotFoundException $e) {
diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index a251e2ad6..49647f4c9 100755
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -67,7 +67,6 @@ class Thelia extends Kernel
         if ($this->debug) {
             ini_set('display_errors', 1);
         }
-        ini_set('display_errors', 1);
         $this->initPropel();
     }
 
diff --git a/local/modules/Front/Config/front.xml b/local/modules/Front/Config/front.xml
index 94234aa20..f3a384250 100755
--- a/local/modules/Front/Config/front.xml
+++ b/local/modules/Front/Config/front.xml
@@ -13,6 +13,11 @@
         <default key="_view">includes/addedToCart</default>
     </route>
 
+    <route id="esi-minicart" path="/mini-cart">
+        <default key="_controller">Front\Controller\CartController::renderMiniCart</default>
+        <default key="_view">includes/mini-cart</default>
+    </route>
+
 
     <!-- Register -->
     <route id="customer.create.process" path="/register" methods="post">
diff --git a/local/modules/Front/Controller/CartController.php b/local/modules/Front/Controller/CartController.php
index d3d24c3bd..9557eab52 100755
--- a/local/modules/Front/Controller/CartController.php
+++ b/local/modules/Front/Controller/CartController.php
@@ -142,4 +142,10 @@ class CartController extends BaseFrontController
         return $cartAdd;
     }
 
+    public function renderMiniCart()
+    {
+       $response = $this->render('includes/mini-cart');
+       return $response;
+    }
+
 }
diff --git a/templates/frontOffice/default/layout.tpl b/templates/frontOffice/default/layout.tpl
index d8433e848..c4db8e8ab 100644
--- a/templates/frontOffice/default/layout.tpl
+++ b/templates/frontOffice/default/layout.tpl
@@ -129,7 +129,7 @@ GNU General Public License : http://www.gnu.org/licenses/
                         </div>
                     </li>
                     {/elseloop}
-                    {include file="includes/mini-cart.html" nocache}
+                    <esi:include src="{url path="/mini-cart"}" alt="fail" ></esi:include>
                 </ul>
                 {/nocache}
                 <ul class="nav navbar-nav navbar-categories">
diff --git a/web/index.php b/web/index.php
index 378bf1430..54ccee7a4 100755
--- a/web/index.php
+++ b/web/index.php
@@ -11,7 +11,7 @@ require __DIR__ . '/../core/bootstrap.php';
 $request = Request::createFromGlobals();
 
 $thelia = new Thelia("prod", false);
-//$thelia = new HttpCache($thelia);
+$thelia = new HttpCache($thelia);
 $response = $thelia->handle($request)->prepare($request)->send();
 
 $thelia->terminate($request, $response);
diff --git a/web/index_dev.php b/web/index_dev.php
index 2ac651a5a..fc0e4e7af 100755
--- a/web/index_dev.php
+++ b/web/index_dev.php
@@ -44,9 +44,8 @@ if ( false === in_array($request->getClientIp(), $trustedIp)) {
     $response = Response::create('Forbidden', 403)->send();
     $thelia->terminate($request, $response);
 } else {
-    $thelia = new HttpCache($thelia);
     $response = $thelia->handle($request)->send();
-    //$thelia->terminate($request, $response);
+    $thelia->terminate($request, $response);
 
 }
 

From cb1db1a63e7d1f5cada6eedb7b4c7eb829ca0f7e Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 20 Nov 2013 10:43:36 +0100
Subject: [PATCH 05/15] remove Thelia ResponseListener

---
 core/lib/Thelia/Config/Resources/action.xml   |  6 --
 core/lib/Thelia/Config/Resources/config.xml   | 16 ++--
 core/lib/Thelia/Core/Bundle/TheliaBundle.php  |  3 +-
 .../Core/EventListener/ResponseListener.php   | 76 -------------------
 4 files changed, 12 insertions(+), 89 deletions(-)
 delete mode 100644 core/lib/Thelia/Core/EventListener/ResponseListener.php

diff --git a/core/lib/Thelia/Config/Resources/action.xml b/core/lib/Thelia/Config/Resources/action.xml
index 60c435a05..d8252f11b 100755
--- a/core/lib/Thelia/Config/Resources/action.xml
+++ b/core/lib/Thelia/Config/Resources/action.xml
@@ -4,12 +4,6 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://thelia.net/schema/dic/config http://thelia.net/schema/dic/config/thelia-1.0.xsd">
 
-    <parameters>
-        <parameter key="thelia.actionEvent" type="collection">
-
-        </parameter>
-    </parameters>
-
     <services>
 
         <service id="thelia.action.cart" class="Thelia\Action\Cart">
diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 54b699b71..f30e6b9cb 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -4,11 +4,13 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://thelia.net/schema/dic/config http://thelia.net/schema/dic/config/thelia-1.0.xsd">
 
+    <parameters>
+        <parameter key="esi.class">Symfony\Component\HttpKernel\HttpCache\Esi</parameter>
+        <parameter key="esi_listener.class">Symfony\Component\HttpKernel\EventListener\EsiListener</parameter>
+    </parameters>
 
     <services>
-
         <!--  URL maganement -->
-
         <service id="thelia.url.manager" class="Thelia\Tools\URL">
             <argument type="service" id="service_container" />
         </service>
@@ -17,6 +19,12 @@
             <argument type="service" id="service_container" />
         </service>
 
+        <service id="esi" class="%esi.class%" />
+
+        <service id="esi_listener" class="%esi_listener.class%">
+            <tag name="kernel.event_subscriber" />
+            <argument type="service" id="esi" on-invalid="ignore" />
+        </service>
 		<!--
 		A ControllerResolver that supports "a:b:c", "service:method" and class::method" notations,
 		thus allowing the definition of controllers as service (see http://symfony.com/fr/doc/current/cookbook/controller/service.html)
@@ -70,10 +78,6 @@
         <service id="mailer" class="Thelia\Mailer\MailerFactory">
             <argument type="service" id="event_dispatcher"/>
         </service>
-
-        <service id="thelia.response.listener" class="Thelia\Core\EventListener\ResponseListener">
-            <tag name="kernel.event_subscriber"/>
-        </service>
     </services>
 
 </config>
diff --git a/core/lib/Thelia/Core/Bundle/TheliaBundle.php b/core/lib/Thelia/Core/Bundle/TheliaBundle.php
index 3df5e4345..4678bae88 100755
--- a/core/lib/Thelia/Core/Bundle/TheliaBundle.php
+++ b/core/lib/Thelia/Core/Bundle/TheliaBundle.php
@@ -22,6 +22,7 @@
 /*************************************************************************************/
 namespace Thelia\Core\Bundle;
 
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Scope;
@@ -61,7 +62,7 @@ class TheliaBundle extends Bundle
 
         $container
             ->addCompilerPass(new TranslatorPass())
-            ->addCompilerPass(new RegisterListenersPass())
+            ->addCompilerPass(new RegisterListenersPass(), PassConfig::TYPE_AFTER_REMOVING)
             ->addCompilerPass(new RegisterParserPluginPass())
             ->addCompilerPass(new RegisterRouterPass())
             ->addCompilerPass(new RegisterCouponPass())
diff --git a/core/lib/Thelia/Core/EventListener/ResponseListener.php b/core/lib/Thelia/Core/EventListener/ResponseListener.php
deleted file mode 100644
index eb03bde81..000000000
--- a/core/lib/Thelia/Core/EventListener/ResponseListener.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/*************************************************************************************/
-/*                                                                                   */
-/*      Thelia	                                                                     */
-/*                                                                                   */
-/*      Copyright (c) OpenStudio                                                     */
-/*      email : info@thelia.net                                                      */
-/*      web : http://www.thelia.net                                                  */
-/*                                                                                   */
-/*      This program is free software; you can redistribute it and/or modify         */
-/*      it under the terms of the GNU General Public License as published by         */
-/*      the Free Software Foundation; either version 3 of the License                */
-/*                                                                                   */
-/*      This program is distributed in the hope that it will be useful,              */
-/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
-/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
-/*      GNU General Public License for more details.                                 */
-/*                                                                                   */
-/*      You should have received a copy of the GNU General Public License            */
-/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
-/*                                                                                   */
-/*************************************************************************************/
-
-namespace Thelia\Core\EventListener;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-
-/**
- * Class ResponseListener
- * @package Thelia\Core\EventListener
- * @author manuel raynaud <mraynaud@openstudio.fr>
- */
-class ResponseListener implements EventSubscriberInterface
-{
-
-    public function onResponse(FilterResponseEvent $event)
-    {
-        $request = $event->getRequest();
-
-        if($request->headers->has('Surrogate-Capability'))
-        {
-            $response = $event->getResponse();
-            $response->headers->set('Surrogate-Control', 'content="ESI/1.0"');
-            $event->setResponse($response);
-        }
-    }
-
-    /**
-     * Returns an array of event names this subscriber wants to listen to.
-     *
-     * The array keys are event names and the value can be:
-     *
-     *  * The method name to call (priority defaults to 0)
-     *  * An array composed of the method name to call and the priority
-     *  * An array of arrays composed of the method names to call and respective
-     *    priorities, or 0 if unset
-     *
-     * For instance:
-     *
-     *  * array('eventName' => 'methodName')
-     *  * array('eventName' => array('methodName', $priority))
-     *  * array('eventName' => array(array('methodName1', $priority), array('methodName2'))
-     *
-     * @return array The event names to listen to
-     *
-     * @api
-     */
-    public static function getSubscribedEvents()
-    {
-        return array(
-            KernelEvents::RESPONSE => array('onResponse', 0)
-        );
-    }
-}
\ No newline at end of file

From a52873a731b41b421d4ffc2c95ee6085abfbe7f7 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 20 Nov 2013 11:52:20 +0100
Subject: [PATCH 06/15] create smarty tag for smarty renderer

---
 core/lib/Thelia/Config/Resources/config.xml   | 10 +++
 .../Thelia/Config/Resources/smarty-plugin.xml |  6 +-
 .../Core/Template/Smarty/Plugins/Esi.php      | 82 +++++++++++++++++++
 templates/frontOffice/default/layout.tpl      |  2 +-
 4 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 core/lib/Thelia/Core/Template/Smarty/Plugins/Esi.php

diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index f30e6b9cb..a5f79b8bf 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -7,6 +7,8 @@
     <parameters>
         <parameter key="esi.class">Symfony\Component\HttpKernel\HttpCache\Esi</parameter>
         <parameter key="esi_listener.class">Symfony\Component\HttpKernel\EventListener\EsiListener</parameter>
+        <parameter key="fragment.renderer.esi.class">Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer</parameter>
+        <parameter key="fragment.renderer.inline.class">Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer</parameter>
     </parameters>
 
     <services>
@@ -24,6 +26,14 @@
         <service id="esi_listener" class="%esi_listener.class%">
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="esi" on-invalid="ignore" />
+        </service>
+        <service id="fragment.renderer.inline" class="%fragment.renderer.inline.class%">
+            <argument type="service" id="http_kernel" />
+        </service>
+
+        <service id="fragment.renderer.esi" class="%fragment.renderer.esi.class%">
+            <argument type="service" id="esi" />
+            <argument type="service" id="fragment.renderer.inline" />
         </service>
 		<!--
 		A ControllerResolver that supports "a:b:c", "service:method" and class::method" notations,
diff --git a/core/lib/Thelia/Config/Resources/smarty-plugin.xml b/core/lib/Thelia/Config/Resources/smarty-plugin.xml
index 9a630d8f5..c3c6a1312 100644
--- a/core/lib/Thelia/Config/Resources/smarty-plugin.xml
+++ b/core/lib/Thelia/Config/Resources/smarty-plugin.xml
@@ -91,7 +91,11 @@
             <argument type="service" id="request" />
         </service>
 
-
+        <service id="smarty.plugin.esi" class="Thelia\Core\Template\Smarty\Plugins\Esi" scope="request">
+            <tag name="thelia.parser.register_plugin"/>
+            <argument type="service" id="fragment.renderer.esi" />
+            <argument type="service" id="request" />
+        </service>
 
     </services>
 
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Esi.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Esi.php
new file mode 100644
index 000000000..453335740
--- /dev/null
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Esi.php
@@ -0,0 +1,82 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\Template\Smarty\Plugins;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer;
+use Thelia\Core\Template\Smarty\AbstractSmartyPlugin;
+use Thelia\Core\Template\Smarty\an;
+use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
+
+
+/**
+ * Class Esi
+ * @package Thelia\Core\Template\Smarty\Plugins
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class Esi extends AbstractSmartyPlugin
+{
+
+    protected $esiFragmentRender;
+    protected $request;
+
+    public function __construct(EsiFragmentRenderer $esiFragmentRenderer, Request $request)
+    {
+        $this->esiFragmentRender = $esiFragmentRenderer;
+        $this->request = $request;
+    }
+
+    public function renderEsi($params, $template = null)
+    {
+        $path = $this->getParam($params, 'path');
+        $alt = $this->getParam($params, 'alt');
+        $ignore_errors = $this->getParam($params, 'ignore_errors');
+        $comment = $this->getParam($params, 'comment');
+
+        if(null === $path) {
+            return;
+        }
+
+        $response = $this->esiFragmentRender->render($path, $this->request, array(
+            'alt' => $alt,
+            'ignore_errors' => $ignore_errors,
+            'comment' => $comment
+        ));
+
+        if (!$response->isSuccessful()) {
+            return null;
+        }
+
+        return $response->getContent();
+    }
+
+    /**
+     * @return an array of SmartyPluginDescriptor
+     */
+    public function getPluginDescriptors()
+    {
+        return array(
+            new SmartyPluginDescriptor('function', 'render_esi', $this, 'renderEsi')
+        );
+    }
+}
\ No newline at end of file
diff --git a/templates/frontOffice/default/layout.tpl b/templates/frontOffice/default/layout.tpl
index c4db8e8ab..4ad47445d 100644
--- a/templates/frontOffice/default/layout.tpl
+++ b/templates/frontOffice/default/layout.tpl
@@ -129,7 +129,7 @@ GNU General Public License : http://www.gnu.org/licenses/
                         </div>
                     </li>
                     {/elseloop}
-                    <esi:include src="{url path="/mini-cart"}" alt="fail" ></esi:include>
+                    {render_esi path="{url path="/mini-cart"}" alt="fail"}
                 </ul>
                 {/nocache}
                 <ul class="nav navbar-nav navbar-categories">

From 16af55ae77e0369fed9eb4f979efb674c40f46ff Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Sat, 5 Oct 2013 11:52:13 +0200
Subject: [PATCH 07/15] start using symfony 2 reverse proxy

---
 .../Core/HttpKernel/HttpCache/HttpCache.php   | 52 +++++++++++++++++++
 core/lib/Thelia/Core/Thelia.php               |  1 +
 web/index.php                                 |  3 +-
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php

diff --git a/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php b/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php
new file mode 100644
index 000000000..01ad22733
--- /dev/null
+++ b/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php
@@ -0,0 +1,52 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\HttpKernel\HttpCache;
+
+use Symfony\Component\HttpKernel\HttpCache\Esi;
+use Symfony\Component\HttpKernel\HttpCache\HttpCache as BaseHttpCache;
+use Symfony\Component\HttpKernel\HttpCache\Store;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+/**
+ * Class HttpCache
+ * @package Thelia\Core\HttpKernel\HttpCache
+ * @author manuel raynaud <mraynaud@openstudio.fr>
+ */
+class HttpCache extends BaseHttpCache
+{
+
+    public function __construct(HttpKernelInterface $kernel, $options = array())
+    {
+        parent::__construct(
+            $kernel,
+            new Store($kernel->getCacheDir().'/http_cache'),
+            new Esi(),
+            array_merge(
+                array('debug' => $kernel->isDebug()),
+                $options
+            )
+        );
+    }
+
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index 49647f4c9..a251e2ad6 100755
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -67,6 +67,7 @@ class Thelia extends Kernel
         if ($this->debug) {
             ini_set('display_errors', 1);
         }
+        ini_set('display_errors', 1);
         $this->initPropel();
     }
 
diff --git a/web/index.php b/web/index.php
index 4d50cc633..378bf1430 100755
--- a/web/index.php
+++ b/web/index.php
@@ -1,4 +1,5 @@
 <?php
+use Thelia\Core\HttpKernel\HttpCache\HttpCache;
 use Thelia\Core\Thelia;
 use Thelia\Core\HttpFoundation\Request;
 
@@ -10,7 +11,7 @@ require __DIR__ . '/../core/bootstrap.php';
 $request = Request::createFromGlobals();
 
 $thelia = new Thelia("prod", false);
-
+//$thelia = new HttpCache($thelia);
 $response = $thelia->handle($request)->prepare($request)->send();
 
 $thelia->terminate($request, $response);

From 6a80dde83bdb6658324707aaafce76a64c4ab28e Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Sun, 6 Oct 2013 10:49:57 +0200
Subject: [PATCH 08/15] add httpcache into index_dev.php file

---
 web/index_dev.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/index_dev.php b/web/index_dev.php
index 6b06585cd..7d9e61bd8 100755
--- a/web/index_dev.php
+++ b/web/index_dev.php
@@ -24,6 +24,7 @@
 use Thelia\Core\Thelia;
 use Thelia\Core\HttpFoundation\Response;
 use Thelia\Core\HttpFoundation\Request;
+use Thelia\Core\HttpKernel\HttpCache\HttpCache;
 
 //use Symfony\Component\DependencyInjection;
 
@@ -43,6 +44,7 @@ if ( false === in_array($request->getClientIp(), $trustedIp)) {
     $response = Response::create('Forbidden', 403)->send();
     $thelia->terminate($request, $response);
 } else {
+    //$thelia = new HttpCache($thelia);
     $response = $thelia->handle($request)->prepare($request)->send();
     $thelia->terminate($request, $response);
 }

From 64c59918388f054e7d0c82b6fc9921a9b6325a49 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Sun, 6 Oct 2013 19:30:58 +0200
Subject: [PATCH 09/15] tweak httpFoundation cache part for compatibility with
 Thelia\HttpFoundation part

---
 .../Thelia/Command/ModuleActivateCommand.php  |  2 -
 core/lib/Thelia/Config/Resources/config.xml   |  4 +-
 .../Core/EventListener/ResponseListener.php   | 76 +++++++++++++++++++
 .../Core/HttpKernel/HttpCache/HttpCache.php   | 21 ++++-
 core/lib/Thelia/Core/TheliaHttpKernel.php     | 39 ++++++----
 web/index_dev.php                             |  7 +-
 6 files changed, 126 insertions(+), 23 deletions(-)
 create mode 100644 core/lib/Thelia/Core/EventListener/ResponseListener.php

diff --git a/core/lib/Thelia/Command/ModuleActivateCommand.php b/core/lib/Thelia/Command/ModuleActivateCommand.php
index 1b8ac600f..139f21e9e 100755
--- a/core/lib/Thelia/Command/ModuleActivateCommand.php
+++ b/core/lib/Thelia/Command/ModuleActivateCommand.php
@@ -63,8 +63,6 @@ class ModuleActivateCommand extends BaseModuleGenerate
         }
 
         try {
-            new \TheliaDebugBar\TheliaDebugBar();
-
             $moduleReflection = new \ReflectionClass($module->getFullNamespace());
 
             $moduleInstance = $moduleReflection->newInstance();
diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 5a3548a9c..54b699b71 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -71,7 +71,9 @@
             <argument type="service" id="event_dispatcher"/>
         </service>
 
-
+        <service id="thelia.response.listener" class="Thelia\Core\EventListener\ResponseListener">
+            <tag name="kernel.event_subscriber"/>
+        </service>
     </services>
 
 </config>
diff --git a/core/lib/Thelia/Core/EventListener/ResponseListener.php b/core/lib/Thelia/Core/EventListener/ResponseListener.php
new file mode 100644
index 000000000..eb03bde81
--- /dev/null
+++ b/core/lib/Thelia/Core/EventListener/ResponseListener.php
@@ -0,0 +1,76 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\EventListener;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+
+/**
+ * Class ResponseListener
+ * @package Thelia\Core\EventListener
+ * @author manuel raynaud <mraynaud@openstudio.fr>
+ */
+class ResponseListener implements EventSubscriberInterface
+{
+
+    public function onResponse(FilterResponseEvent $event)
+    {
+        $request = $event->getRequest();
+
+        if($request->headers->has('Surrogate-Capability'))
+        {
+            $response = $event->getResponse();
+            $response->headers->set('Surrogate-Control', 'content="ESI/1.0"');
+            $event->setResponse($response);
+        }
+    }
+
+    /**
+     * Returns an array of event names this subscriber wants to listen to.
+     *
+     * The array keys are event names and the value can be:
+     *
+     *  * The method name to call (priority defaults to 0)
+     *  * An array composed of the method name to call and the priority
+     *  * An array of arrays composed of the method names to call and respective
+     *    priorities, or 0 if unset
+     *
+     * For instance:
+     *
+     *  * array('eventName' => 'methodName')
+     *  * array('eventName' => array('methodName', $priority))
+     *  * array('eventName' => array(array('methodName1', $priority), array('methodName2'))
+     *
+     * @return array The event names to listen to
+     *
+     * @api
+     */
+    public static function getSubscribedEvents()
+    {
+        return array(
+            KernelEvents::RESPONSE => array('onResponse', 0)
+        );
+    }
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php b/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php
index 01ad22733..b45f0f812 100644
--- a/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php
+++ b/core/lib/Thelia/Core/HttpKernel/HttpCache/HttpCache.php
@@ -23,17 +23,20 @@
 
 namespace Thelia\Core\HttpKernel\HttpCache;
 
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpCache\Esi;
 use Symfony\Component\HttpKernel\HttpCache\HttpCache as BaseHttpCache;
 use Symfony\Component\HttpKernel\HttpCache\Store;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
+use Thelia\Core\HttpFoundation\Request as TheliaRequest;
+
 /**
  * Class HttpCache
  * @package Thelia\Core\HttpKernel\HttpCache
  * @author manuel raynaud <mraynaud@openstudio.fr>
  */
-class HttpCache extends BaseHttpCache
+class HttpCache extends BaseHttpCache implements HttpKernelInterface
 {
 
     public function __construct(HttpKernelInterface $kernel, $options = array())
@@ -49,4 +52,20 @@ class HttpCache extends BaseHttpCache
         );
     }
 
+    public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
+    {
+        if (!($request instanceof \Thelia\Core\HttpFoundation\Request)) {
+            $request = TheliaRequest::create(
+                $request->getUri(),
+                $request->getMethod(),
+                $request->getMethod() == 'GET' ? $request->query->all() : $request->request->all(),
+                $request->cookies->all(),
+                $request->files->all(),
+                $request->server->all(),
+                $request->getContent()
+            );
+        }
+        return parent::handle($request, $type, $catch);
+    }
+
 }
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/TheliaHttpKernel.php b/core/lib/Thelia/Core/TheliaHttpKernel.php
index 94ad7f9de..ed4dd672b 100755
--- a/core/lib/Thelia/Core/TheliaHttpKernel.php
+++ b/core/lib/Thelia/Core/TheliaHttpKernel.php
@@ -43,6 +43,7 @@ use Thelia\Model;
 
 class TheliaHttpKernel extends HttpKernel
 {
+    protected static $session;
 
     protected $container;
 
@@ -79,8 +80,11 @@ class TheliaHttpKernel extends HttpKernel
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
         //$request->headers->set('X-Php-Ob-Level', ob_get_level());
-        $request = $this->initSession($request);
-        $this->initParam($request);
+        if ($type == HttpKernelInterface::MASTER_REQUEST) {
+            $request = $this->initSession($request);
+            $this->initParam($request);
+        }
+
         $this->container->enterScope('request');
         $this->container->set('request', $request, 'request');
 
@@ -211,26 +215,29 @@ class TheliaHttpKernel extends HttpKernel
 
     protected function initSession(Request $request)
     {
+        if(null === self::$session) {
+            $storage = new Session\Storage\NativeSessionStorage();
 
-        $storage = new Session\Storage\NativeSessionStorage();
+            if (Model\ConfigQuery::read("session_config.default")) {
+                $storage->setSaveHandler(new Session\Storage\Handler\NativeFileSessionHandler(Model\ConfigQuery::read("session_config.save_path", THELIA_ROOT . '/local/session/')));
+            } else {
+                $handlerString = Model\ConfigQuery::read("session_config.handlers", 'Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler');
 
-        if (Model\ConfigQuery::read("session_config.default")) {
-            $storage->setSaveHandler(new Session\Storage\Handler\NativeFileSessionHandler(Model\ConfigQuery::read("session_config.save_path", THELIA_LOCAL_DIR . 'session/')));
+                $handler = new $handlerString;
+
+                $storage->setSaveHandler($handler);
+            }
+
+            if (Model\ConfigQuery::read("session_config.config", null)) {
+                $storage->setOptions(json_decode(Model\ConfigQuery::read("session_config.config")));
+            }
+
+            self::$session = $session = new \Thelia\Core\HttpFoundation\Session\Session($storage);
         } else {
-            $handlerString = Model\ConfigQuery::read("session_config.handlers", 'Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler');
-
-            $handler = new $handlerString;
-
-            $storage->setSaveHandler($handler);
+            $session = self::$session;
         }
 
-        if (Model\ConfigQuery::read("session_config.config", null)) {
-           $storage->setOptions(json_decode(Model\ConfigQuery::read("session_config.config")));
-        }
-
-        $session = new \Thelia\Core\HttpFoundation\Session\Session($storage);
         $session->start();
-
         $request->setSession($session);
 
         return $request;
diff --git a/web/index_dev.php b/web/index_dev.php
index 7d9e61bd8..2ac651a5a 100755
--- a/web/index_dev.php
+++ b/web/index_dev.php
@@ -44,9 +44,10 @@ if ( false === in_array($request->getClientIp(), $trustedIp)) {
     $response = Response::create('Forbidden', 403)->send();
     $thelia->terminate($request, $response);
 } else {
-    //$thelia = new HttpCache($thelia);
-    $response = $thelia->handle($request)->prepare($request)->send();
-    $thelia->terminate($request, $response);
+    $thelia = new HttpCache($thelia);
+    $response = $thelia->handle($request)->send();
+    //$thelia->terminate($request, $response);
+
 }
 
 

From a436adf43822a83a8004f56f17be563102c4d6bb Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 20 Nov 2013 10:09:12 +0100
Subject: [PATCH 10/15] add new route for testing esi tag

---
 core/lib/Thelia/Core/EventListener/ViewListener.php | 4 ++--
 core/lib/Thelia/Core/Thelia.php                     | 1 -
 local/modules/Front/Config/front.xml                | 5 +++++
 local/modules/Front/Controller/CartController.php   | 6 ++++++
 templates/frontOffice/default/layout.tpl            | 2 +-
 web/index.php                                       | 2 +-
 web/index_dev.php                                   | 3 +--
 7 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/core/lib/Thelia/Core/EventListener/ViewListener.php b/core/lib/Thelia/Core/EventListener/ViewListener.php
index 4bdfd2195..4b1d3343a 100755
--- a/core/lib/Thelia/Core/EventListener/ViewListener.php
+++ b/core/lib/Thelia/Core/EventListener/ViewListener.php
@@ -90,13 +90,13 @@ class ViewListener implements EventSubscriberInterface
                 $response = new Response($content, $parser->getStatus() ?: 200);
             }
 
-/*            $response->setCache(array(
+            $response->setCache(array(
                 'last_modified' => new \DateTime(),
                 'max_age'       => 600,
                 's_maxage'      => 600,
                 'private'       => false,
                 'public'        => true,
-            ));*/
+            ));
 
             $event->setResponse($response);
         } catch (ResourceNotFoundException $e) {
diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index a251e2ad6..49647f4c9 100755
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -67,7 +67,6 @@ class Thelia extends Kernel
         if ($this->debug) {
             ini_set('display_errors', 1);
         }
-        ini_set('display_errors', 1);
         $this->initPropel();
     }
 
diff --git a/local/modules/Front/Config/front.xml b/local/modules/Front/Config/front.xml
index 94234aa20..f3a384250 100755
--- a/local/modules/Front/Config/front.xml
+++ b/local/modules/Front/Config/front.xml
@@ -13,6 +13,11 @@
         <default key="_view">includes/addedToCart</default>
     </route>
 
+    <route id="esi-minicart" path="/mini-cart">
+        <default key="_controller">Front\Controller\CartController::renderMiniCart</default>
+        <default key="_view">includes/mini-cart</default>
+    </route>
+
 
     <!-- Register -->
     <route id="customer.create.process" path="/register" methods="post">
diff --git a/local/modules/Front/Controller/CartController.php b/local/modules/Front/Controller/CartController.php
index d3d24c3bd..9557eab52 100755
--- a/local/modules/Front/Controller/CartController.php
+++ b/local/modules/Front/Controller/CartController.php
@@ -142,4 +142,10 @@ class CartController extends BaseFrontController
         return $cartAdd;
     }
 
+    public function renderMiniCart()
+    {
+       $response = $this->render('includes/mini-cart');
+       return $response;
+    }
+
 }
diff --git a/templates/frontOffice/default/layout.tpl b/templates/frontOffice/default/layout.tpl
index d8433e848..c4db8e8ab 100644
--- a/templates/frontOffice/default/layout.tpl
+++ b/templates/frontOffice/default/layout.tpl
@@ -129,7 +129,7 @@ GNU General Public License : http://www.gnu.org/licenses/
                         </div>
                     </li>
                     {/elseloop}
-                    {include file="includes/mini-cart.html" nocache}
+                    <esi:include src="{url path="/mini-cart"}" alt="fail" ></esi:include>
                 </ul>
                 {/nocache}
                 <ul class="nav navbar-nav navbar-categories">
diff --git a/web/index.php b/web/index.php
index 378bf1430..54ccee7a4 100755
--- a/web/index.php
+++ b/web/index.php
@@ -11,7 +11,7 @@ require __DIR__ . '/../core/bootstrap.php';
 $request = Request::createFromGlobals();
 
 $thelia = new Thelia("prod", false);
-//$thelia = new HttpCache($thelia);
+$thelia = new HttpCache($thelia);
 $response = $thelia->handle($request)->prepare($request)->send();
 
 $thelia->terminate($request, $response);
diff --git a/web/index_dev.php b/web/index_dev.php
index 2ac651a5a..fc0e4e7af 100755
--- a/web/index_dev.php
+++ b/web/index_dev.php
@@ -44,9 +44,8 @@ if ( false === in_array($request->getClientIp(), $trustedIp)) {
     $response = Response::create('Forbidden', 403)->send();
     $thelia->terminate($request, $response);
 } else {
-    $thelia = new HttpCache($thelia);
     $response = $thelia->handle($request)->send();
-    //$thelia->terminate($request, $response);
+    $thelia->terminate($request, $response);
 
 }
 

From b9f78376862c8ede255e414c16b2eb673a728a50 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 20 Nov 2013 10:43:36 +0100
Subject: [PATCH 11/15] remove Thelia ResponseListener

---
 core/lib/Thelia/Config/Resources/action.xml   |  6 --
 core/lib/Thelia/Config/Resources/config.xml   | 16 ++--
 core/lib/Thelia/Core/Bundle/TheliaBundle.php  |  3 +-
 .../Core/EventListener/ResponseListener.php   | 76 -------------------
 4 files changed, 12 insertions(+), 89 deletions(-)
 delete mode 100644 core/lib/Thelia/Core/EventListener/ResponseListener.php

diff --git a/core/lib/Thelia/Config/Resources/action.xml b/core/lib/Thelia/Config/Resources/action.xml
index 60c435a05..d8252f11b 100755
--- a/core/lib/Thelia/Config/Resources/action.xml
+++ b/core/lib/Thelia/Config/Resources/action.xml
@@ -4,12 +4,6 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://thelia.net/schema/dic/config http://thelia.net/schema/dic/config/thelia-1.0.xsd">
 
-    <parameters>
-        <parameter key="thelia.actionEvent" type="collection">
-
-        </parameter>
-    </parameters>
-
     <services>
 
         <service id="thelia.action.cart" class="Thelia\Action\Cart">
diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 54b699b71..f30e6b9cb 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -4,11 +4,13 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://thelia.net/schema/dic/config http://thelia.net/schema/dic/config/thelia-1.0.xsd">
 
+    <parameters>
+        <parameter key="esi.class">Symfony\Component\HttpKernel\HttpCache\Esi</parameter>
+        <parameter key="esi_listener.class">Symfony\Component\HttpKernel\EventListener\EsiListener</parameter>
+    </parameters>
 
     <services>
-
         <!--  URL maganement -->
-
         <service id="thelia.url.manager" class="Thelia\Tools\URL">
             <argument type="service" id="service_container" />
         </service>
@@ -17,6 +19,12 @@
             <argument type="service" id="service_container" />
         </service>
 
+        <service id="esi" class="%esi.class%" />
+
+        <service id="esi_listener" class="%esi_listener.class%">
+            <tag name="kernel.event_subscriber" />
+            <argument type="service" id="esi" on-invalid="ignore" />
+        </service>
 		<!--
 		A ControllerResolver that supports "a:b:c", "service:method" and class::method" notations,
 		thus allowing the definition of controllers as service (see http://symfony.com/fr/doc/current/cookbook/controller/service.html)
@@ -70,10 +78,6 @@
         <service id="mailer" class="Thelia\Mailer\MailerFactory">
             <argument type="service" id="event_dispatcher"/>
         </service>
-
-        <service id="thelia.response.listener" class="Thelia\Core\EventListener\ResponseListener">
-            <tag name="kernel.event_subscriber"/>
-        </service>
     </services>
 
 </config>
diff --git a/core/lib/Thelia/Core/Bundle/TheliaBundle.php b/core/lib/Thelia/Core/Bundle/TheliaBundle.php
index 3df5e4345..4678bae88 100755
--- a/core/lib/Thelia/Core/Bundle/TheliaBundle.php
+++ b/core/lib/Thelia/Core/Bundle/TheliaBundle.php
@@ -22,6 +22,7 @@
 /*************************************************************************************/
 namespace Thelia\Core\Bundle;
 
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Scope;
@@ -61,7 +62,7 @@ class TheliaBundle extends Bundle
 
         $container
             ->addCompilerPass(new TranslatorPass())
-            ->addCompilerPass(new RegisterListenersPass())
+            ->addCompilerPass(new RegisterListenersPass(), PassConfig::TYPE_AFTER_REMOVING)
             ->addCompilerPass(new RegisterParserPluginPass())
             ->addCompilerPass(new RegisterRouterPass())
             ->addCompilerPass(new RegisterCouponPass())
diff --git a/core/lib/Thelia/Core/EventListener/ResponseListener.php b/core/lib/Thelia/Core/EventListener/ResponseListener.php
deleted file mode 100644
index eb03bde81..000000000
--- a/core/lib/Thelia/Core/EventListener/ResponseListener.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/*************************************************************************************/
-/*                                                                                   */
-/*      Thelia	                                                                     */
-/*                                                                                   */
-/*      Copyright (c) OpenStudio                                                     */
-/*      email : info@thelia.net                                                      */
-/*      web : http://www.thelia.net                                                  */
-/*                                                                                   */
-/*      This program is free software; you can redistribute it and/or modify         */
-/*      it under the terms of the GNU General Public License as published by         */
-/*      the Free Software Foundation; either version 3 of the License                */
-/*                                                                                   */
-/*      This program is distributed in the hope that it will be useful,              */
-/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
-/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
-/*      GNU General Public License for more details.                                 */
-/*                                                                                   */
-/*      You should have received a copy of the GNU General Public License            */
-/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
-/*                                                                                   */
-/*************************************************************************************/
-
-namespace Thelia\Core\EventListener;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-
-/**
- * Class ResponseListener
- * @package Thelia\Core\EventListener
- * @author manuel raynaud <mraynaud@openstudio.fr>
- */
-class ResponseListener implements EventSubscriberInterface
-{
-
-    public function onResponse(FilterResponseEvent $event)
-    {
-        $request = $event->getRequest();
-
-        if($request->headers->has('Surrogate-Capability'))
-        {
-            $response = $event->getResponse();
-            $response->headers->set('Surrogate-Control', 'content="ESI/1.0"');
-            $event->setResponse($response);
-        }
-    }
-
-    /**
-     * Returns an array of event names this subscriber wants to listen to.
-     *
-     * The array keys are event names and the value can be:
-     *
-     *  * The method name to call (priority defaults to 0)
-     *  * An array composed of the method name to call and the priority
-     *  * An array of arrays composed of the method names to call and respective
-     *    priorities, or 0 if unset
-     *
-     * For instance:
-     *
-     *  * array('eventName' => 'methodName')
-     *  * array('eventName' => array('methodName', $priority))
-     *  * array('eventName' => array(array('methodName1', $priority), array('methodName2'))
-     *
-     * @return array The event names to listen to
-     *
-     * @api
-     */
-    public static function getSubscribedEvents()
-    {
-        return array(
-            KernelEvents::RESPONSE => array('onResponse', 0)
-        );
-    }
-}
\ No newline at end of file

From 4109de0d9c536e7e9e832c7750c7548c37f30ab1 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 20 Nov 2013 11:52:20 +0100
Subject: [PATCH 12/15] create smarty tag for smarty renderer

---
 core/lib/Thelia/Config/Resources/config.xml   | 10 +++
 .../Thelia/Config/Resources/smarty-plugin.xml |  6 +-
 .../Core/Template/Smarty/Plugins/Esi.php      | 82 +++++++++++++++++++
 templates/frontOffice/default/layout.tpl      |  2 +-
 4 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 core/lib/Thelia/Core/Template/Smarty/Plugins/Esi.php

diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index f30e6b9cb..a5f79b8bf 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -7,6 +7,8 @@
     <parameters>
         <parameter key="esi.class">Symfony\Component\HttpKernel\HttpCache\Esi</parameter>
         <parameter key="esi_listener.class">Symfony\Component\HttpKernel\EventListener\EsiListener</parameter>
+        <parameter key="fragment.renderer.esi.class">Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer</parameter>
+        <parameter key="fragment.renderer.inline.class">Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer</parameter>
     </parameters>
 
     <services>
@@ -24,6 +26,14 @@
         <service id="esi_listener" class="%esi_listener.class%">
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="esi" on-invalid="ignore" />
+        </service>
+        <service id="fragment.renderer.inline" class="%fragment.renderer.inline.class%">
+            <argument type="service" id="http_kernel" />
+        </service>
+
+        <service id="fragment.renderer.esi" class="%fragment.renderer.esi.class%">
+            <argument type="service" id="esi" />
+            <argument type="service" id="fragment.renderer.inline" />
         </service>
 		<!--
 		A ControllerResolver that supports "a:b:c", "service:method" and class::method" notations,
diff --git a/core/lib/Thelia/Config/Resources/smarty-plugin.xml b/core/lib/Thelia/Config/Resources/smarty-plugin.xml
index 9a630d8f5..c3c6a1312 100644
--- a/core/lib/Thelia/Config/Resources/smarty-plugin.xml
+++ b/core/lib/Thelia/Config/Resources/smarty-plugin.xml
@@ -91,7 +91,11 @@
             <argument type="service" id="request" />
         </service>
 
-
+        <service id="smarty.plugin.esi" class="Thelia\Core\Template\Smarty\Plugins\Esi" scope="request">
+            <tag name="thelia.parser.register_plugin"/>
+            <argument type="service" id="fragment.renderer.esi" />
+            <argument type="service" id="request" />
+        </service>
 
     </services>
 
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Esi.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Esi.php
new file mode 100644
index 000000000..453335740
--- /dev/null
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Esi.php
@@ -0,0 +1,82 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\Template\Smarty\Plugins;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer;
+use Thelia\Core\Template\Smarty\AbstractSmartyPlugin;
+use Thelia\Core\Template\Smarty\an;
+use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
+
+
+/**
+ * Class Esi
+ * @package Thelia\Core\Template\Smarty\Plugins
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class Esi extends AbstractSmartyPlugin
+{
+
+    protected $esiFragmentRender;
+    protected $request;
+
+    public function __construct(EsiFragmentRenderer $esiFragmentRenderer, Request $request)
+    {
+        $this->esiFragmentRender = $esiFragmentRenderer;
+        $this->request = $request;
+    }
+
+    public function renderEsi($params, $template = null)
+    {
+        $path = $this->getParam($params, 'path');
+        $alt = $this->getParam($params, 'alt');
+        $ignore_errors = $this->getParam($params, 'ignore_errors');
+        $comment = $this->getParam($params, 'comment');
+
+        if(null === $path) {
+            return;
+        }
+
+        $response = $this->esiFragmentRender->render($path, $this->request, array(
+            'alt' => $alt,
+            'ignore_errors' => $ignore_errors,
+            'comment' => $comment
+        ));
+
+        if (!$response->isSuccessful()) {
+            return null;
+        }
+
+        return $response->getContent();
+    }
+
+    /**
+     * @return an array of SmartyPluginDescriptor
+     */
+    public function getPluginDescriptors()
+    {
+        return array(
+            new SmartyPluginDescriptor('function', 'render_esi', $this, 'renderEsi')
+        );
+    }
+}
\ No newline at end of file
diff --git a/templates/frontOffice/default/layout.tpl b/templates/frontOffice/default/layout.tpl
index c4db8e8ab..4ad47445d 100644
--- a/templates/frontOffice/default/layout.tpl
+++ b/templates/frontOffice/default/layout.tpl
@@ -129,7 +129,7 @@ GNU General Public License : http://www.gnu.org/licenses/
                         </div>
                     </li>
                     {/elseloop}
-                    <esi:include src="{url path="/mini-cart"}" alt="fail" ></esi:include>
+                    {render_esi path="{url path="/mini-cart"}" alt="fail"}
                 </ul>
                 {/nocache}
                 <ul class="nav navbar-nav navbar-categories">

From a85baf69944e37292b31d665f99a160fa2feb020 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 22 Nov 2013 09:43:24 +0100
Subject: [PATCH 13/15] remove specific code testing esi integration

---
 core/lib/Thelia/Core/EventListener/ViewListener.php | 10 +---------
 local/modules/Front/Config/front.xml                |  7 +------
 local/modules/Front/Controller/CartController.php   |  6 ------
 templates/frontOffice/default/layout.tpl            |  2 +-
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/core/lib/Thelia/Core/EventListener/ViewListener.php b/core/lib/Thelia/Core/EventListener/ViewListener.php
index 4b1d3343a..022043bee 100755
--- a/core/lib/Thelia/Core/EventListener/ViewListener.php
+++ b/core/lib/Thelia/Core/EventListener/ViewListener.php
@@ -85,19 +85,11 @@ class ViewListener implements EventSubscriberInterface
             $content = $parser->render($request->attributes->get('_view').".html");
 
             if ($content instanceof Response) {
-                $response = $content;$event->setResponse($content);
+                $response = $content;
             } else {
                 $response = new Response($content, $parser->getStatus() ?: 200);
             }
 
-            $response->setCache(array(
-                'last_modified' => new \DateTime(),
-                'max_age'       => 600,
-                's_maxage'      => 600,
-                'private'       => false,
-                'public'        => true,
-            ));
-
             $event->setResponse($response);
         } catch (ResourceNotFoundException $e) {
             throw new NotFoundHttpException();
diff --git a/local/modules/Front/Config/front.xml b/local/modules/Front/Config/front.xml
index f3a384250..84a532124 100755
--- a/local/modules/Front/Config/front.xml
+++ b/local/modules/Front/Config/front.xml
@@ -8,17 +8,12 @@
         <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
         <default key="_view">includes/mini-cart</default>
     </route>
+
     <route id="ajax.addCartMessage" path="/ajax/addCartMessage">
         <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
         <default key="_view">includes/addedToCart</default>
     </route>
 
-    <route id="esi-minicart" path="/mini-cart">
-        <default key="_controller">Front\Controller\CartController::renderMiniCart</default>
-        <default key="_view">includes/mini-cart</default>
-    </route>
-
-
     <!-- Register -->
     <route id="customer.create.process" path="/register" methods="post">
         <default key="_controller">Front\Controller\CustomerController::createAction</default>
diff --git a/local/modules/Front/Controller/CartController.php b/local/modules/Front/Controller/CartController.php
index 9557eab52..d3d24c3bd 100755
--- a/local/modules/Front/Controller/CartController.php
+++ b/local/modules/Front/Controller/CartController.php
@@ -142,10 +142,4 @@ class CartController extends BaseFrontController
         return $cartAdd;
     }
 
-    public function renderMiniCart()
-    {
-       $response = $this->render('includes/mini-cart');
-       return $response;
-    }
-
 }
diff --git a/templates/frontOffice/default/layout.tpl b/templates/frontOffice/default/layout.tpl
index 4ad47445d..d8433e848 100644
--- a/templates/frontOffice/default/layout.tpl
+++ b/templates/frontOffice/default/layout.tpl
@@ -129,7 +129,7 @@ GNU General Public License : http://www.gnu.org/licenses/
                         </div>
                     </li>
                     {/elseloop}
-                    {render_esi path="{url path="/mini-cart"}" alt="fail"}
+                    {include file="includes/mini-cart.html" nocache}
                 </ul>
                 {/nocache}
                 <ul class="nav navbar-nav navbar-categories">

From 5d52a34f050362faa5c73073656604e3f97792b3 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 22 Nov 2013 10:02:42 +0100
Subject: [PATCH 14/15] HttpCache can not be activated as default

---
 web/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/index.php b/web/index.php
index 54ccee7a4..378bf1430 100755
--- a/web/index.php
+++ b/web/index.php
@@ -11,7 +11,7 @@ require __DIR__ . '/../core/bootstrap.php';
 $request = Request::createFromGlobals();
 
 $thelia = new Thelia("prod", false);
-$thelia = new HttpCache($thelia);
+//$thelia = new HttpCache($thelia);
 $response = $thelia->handle($request)->prepare($request)->send();
 
 $thelia->terminate($request, $response);

From 338a97c091aaf41ec67a0fc46ac47ef9dde8e6c3 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 22 Nov 2013 10:04:14 +0100
Subject: [PATCH 15/15] undo removing Response::prepare call

---
 web/index_dev.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/index_dev.php b/web/index_dev.php
index fc0e4e7af..9d516407e 100755
--- a/web/index_dev.php
+++ b/web/index_dev.php
@@ -44,7 +44,7 @@ if ( false === in_array($request->getClientIp(), $trustedIp)) {
     $response = Response::create('Forbidden', 403)->send();
     $thelia->terminate($request, $response);
 } else {
-    $response = $thelia->handle($request)->send();
+    $response = $thelia->handle($request)->prepare($request)->send();
     $thelia->terminate($request, $response);
 
 }