Merge pull request #824 from nexcess/devel

refs #521  	Fix for search input field on search results page and PHP 5.6.

.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

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)
+

app/design/frontend/base/default/layout/turpentine_esi.xml

@@ -178,6 +178,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 -->