From 8cb2594aaa99c864ff23910a4a8f981300bce0e8 Mon Sep 17 00:00:00 2001
From: Jeroen Vermeulen <info@jeroenvermeulen.eu>
Date: Sun, 4 May 2014 02:25:21 +0200
Subject: [PATCH 1/3] Fix for search input field on search results page If the
 search input box is inside the header, it needs to contain the current search
 string after searching. Before this fix, the header ESI block was cached, so
 this did not work. The search string was wrong or not showing.

---
 .../base/default/layout/turpentine_esi.xml    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/design/frontend/base/default/layout/turpentine_esi.xml b/app/design/frontend/base/default/layout/turpentine_esi.xml
index d23839590..1ba06d47a 100644
--- a/app/design/frontend/base/default/layout/turpentine_esi.xml
+++ b/app/design/frontend/base/default/layout/turpentine_esi.xml
@@ -177,6 +177,25 @@
         -->
     </catalog_product_compare_index>
 
+    <!-- Catalog Search -->
+
+    <!--
+    If the search input box is inside the header, it needs to contain the current search string after searching.
+    The block below overrules the ESI Options for the header on the search results page.
+    We change the scope of the header to "page", so the current URL is passed to the ESI request.
+    We set the TTL to 0, because the same user is probably not going to search for the same string again.
+    -->
+    <catalogsearch_result_index>
+        <reference name="header">
+            <action method="setEsiOptions">
+                <params>
+                    <access>private</access>
+                    <scope>page</scope>
+                    <ttl>0</ttl>
+                </params>
+            </action>
+        </reference>
+    </catalogsearch_result_index>
 
     <!-- Checkout -->
 

From 0d297eb90a9d4fb4d173514a248a5387274fac22 Mon Sep 17 00:00:00 2001
From: Miguel Balparda <miguel.balparda@moozo.com.ar>
Date: Wed, 24 Jun 2015 17:13:56 +0000
Subject: [PATCH 2/3] refs #521 added to changelog.

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 440676c4f..23bd93b3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -389,4 +389,6 @@ Magento CE 1.8+ or EE 1.13+, see [these instructions](https://github.com/nexcess
 
 ### RELEASE-0.6.3
   * [#499] Use rewrite instead of local Session model for form key handling (@eth8505)  
-  * [#817]  Damian/cache management extended. Added validations for EE and Full Page cache (@damian-pastorini)
+  * [#817] Damian/cache management extended. Added validations for EE and Full Page cache (@damian-pastorini)
+  * [#521] Fix for search input field on search results page (@jeroenvermeulen)
+

From 42dfd51a813f6d2adbe1e7c9b78a78265647a53a Mon Sep 17 00:00:00 2001
From: Miguel Balparda <miguel.balparda@moozo.com.ar>
Date: Wed, 24 Jun 2015 17:55:22 +0000
Subject: [PATCH 3/3] refs EOL for PHP 5.5.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d861b4d87..5b015828a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,10 @@
 language: php
 
 php:
-    - 5.2
     - 5.3
     - 5.4
     - 5.5
+    - 5.6
 
 install:
     - sudo apt-get install -qq python-markdown libxml-xpath-perl build-essential