From dc5191894e6b19494ece2d4f0a563d262729a696 Mon Sep 17 00:00:00 2001
From: Alessandro Niciforo <a.niciforo@eataly.it>
Date: Tue, 23 May 2017 13:15:29 +0200
Subject: [PATCH 1/7] Get last block found in the XML instead of the first,
 exactly how Magento would do it

---
 app/code/community/Nexcessnet/Turpentine/Helper/Esi.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/community/Nexcessnet/Turpentine/Helper/Esi.php b/app/code/community/Nexcessnet/Turpentine/Helper/Esi.php
index d9054c6fe..b0bca51b3 100644
--- a/app/code/community/Nexcessnet/Turpentine/Helper/Esi.php
+++ b/app/code/community/Nexcessnet/Turpentine/Helper/Esi.php
@@ -375,13 +375,13 @@ public function getFormKeyEsiUrl() {
      */
     public function getEsiLayoutBlockNode($layout, $blockName) {
         // first try very specific by checking for action setEsiOptions inside block
-        $blockNode = current($layout->getNode()->xpath(
+        $blockNode = end($layout->getNode()->xpath(
             sprintf('//block[@name=\'%s\'][action[@method=\'setEsiOptions\']]',
                 $blockName)
         ));
         // fallback: only match name
         if ( ! ($blockNode instanceof Mage_Core_Model_Layout_Element)) {
-            $blockNode = current($layout->getNode()->xpath(
+            $blockNode = end($layout->getNode()->xpath(
                 sprintf('//block[@name=\'%s\']', $blockName)
             ));
         }

From e71f0fbb4b3655177081292bfd03152907cbc98e Mon Sep 17 00:00:00 2001
From: Andrew Kett <andrew@8wiredigital.co.nz>
Date: Wed, 26 Jul 2017 14:49:23 +1200
Subject: [PATCH 2/7] use 503 response for maintenance rather than 404

---
 .../Turpentine/Model/Varnish/Configurator/Abstract.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Abstract.php b/app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Abstract.php
index 2b1abb0d0..436159b2d 100644
--- a/app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Abstract.php
+++ b/app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Abstract.php
@@ -971,7 +971,7 @@ protected function _vcl_sub_synth()
                 $tpl = <<<EOS
 sub vcl_synth {
     if (resp.status == 999) {
-        set resp.status = 404;
+        set resp.status = 503;
         set resp.http.Content-Type = "text/html; charset=utf-8";
         synthetic({"{{vcl_synth_content}}"});
         return (deliver);

From 0cc851490a7b2d535857b24c86388e97c18f7674 Mon Sep 17 00:00:00 2001
From: Dovydas Altaravicius <dovydas@adeoweb.lt>
Date: Wed, 30 Aug 2017 11:57:10 +0300
Subject: [PATCH 3/7] Strict Notice: Version4 function _vcl_director_backend

---
 .../Turpentine/Model/Varnish/Configurator/Version4.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Version4.php b/app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Version4.php
index 78c44c642..e2d119fbb 100644
--- a/app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Version4.php
+++ b/app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Version4.php
@@ -165,7 +165,7 @@ protected function _vcl_director($name, $backendOptions) {
      * @param array  $options    extra options for backend
      * @return string
      */
-    protected function _vcl_director_backend($host, $port, $descriptor, $probeUrl = '', $options = array()) {
+    protected function _vcl_director_backend($host, $port, $descriptor = '', $probeUrl = '', $options = array()) {
         $tpl = <<<EOS
         backend web{$descriptor} {
             .host = "{{host}}";

From b3a9cff678120423a2f67439b950f12e901418b9 Mon Sep 17 00:00:00 2001
From: Chris Orlando <chrsorlando@gmail.com>
Date: Wed, 20 Dec 2017 10:45:19 -0500
Subject: [PATCH 4/7] Fix travis build

---
 .travis.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 199d0e0f7..255ad8891 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,23 @@
 language: php
 php:
-    - 5.3
     - 5.4
     - 5.5
     - 5.6
 
+# precise must be used for PHP 5.3
+# https://docs.travis-ci.com/user/reference/trusty#PHP-images
+matrix:
+  include:
+    - php: 5.3
+      dist: precise
+
 addons:
   apt:
     packages:
     - python-markdown
     - libxml-xpath-perl
     - build-essential
+    - libxml2-utils
 
 script:
     - make all

From db94e6b07b28735fa3ba14a804a6bedcff3caef4 Mon Sep 17 00:00:00 2001
From: Simon Sprankel <sprankhub@users.noreply.github.com>
Date: Tue, 2 Jan 2018 12:57:34 +0100
Subject: [PATCH 5/7] added ESI options for contact form, #116, #486

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

diff --git a/app/design/frontend/base/default/layout/turpentine_esi.xml b/app/design/frontend/base/default/layout/turpentine_esi.xml
index 40ebb8d0c..969502a06 100644
--- a/app/design/frontend/base/default/layout/turpentine_esi.xml
+++ b/app/design/frontend/base/default/layout/turpentine_esi.xml
@@ -455,6 +455,18 @@
         <turpentine_cache_flag value="0"/>
     </customer_account_confirmation>
 
+    <contacts_index_index>
+        <reference name="contactForm">
+            <action method="setEsiOptions">
+                <params>
+                    <method>esi</method>
+                    <access>private</access>
+                    <ttl>0</ttl>
+                </params>
+            </action>
+        </reference>
+    </contacts_index_index>
+
 <!--
     <customer_account_edit>
         <turpentine_cache_flag value="0"/>

From 76f75af6f3d2e6f2cc23ef7b91ca26e073d8c645 Mon Sep 17 00:00:00 2001
From: Simon Sprankel <sprankhub@users.noreply.github.com>
Date: Thu, 22 Feb 2018 09:16:08 +0100
Subject: [PATCH 6/7] excluded whole contacts page to fix form action issues

---
 .../frontend/base/default/layout/turpentine_esi.xml   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/design/frontend/base/default/layout/turpentine_esi.xml b/app/design/frontend/base/default/layout/turpentine_esi.xml
index 969502a06..bd136e4fc 100644
--- a/app/design/frontend/base/default/layout/turpentine_esi.xml
+++ b/app/design/frontend/base/default/layout/turpentine_esi.xml
@@ -456,15 +456,8 @@
     </customer_account_confirmation>
 
     <contacts_index_index>
-        <reference name="contactForm">
-            <action method="setEsiOptions">
-                <params>
-                    <method>esi</method>
-                    <access>private</access>
-                    <ttl>0</ttl>
-                </params>
-            </action>
-        </reference>
+        <!-- wholepunching the contactForm block is not enough since the form action is wrong in this case -->
+        <turpentine_cache_flag value="0"/>
     </contacts_index_index>
 
 <!--

From 06369d4eb0f375e559bd5ea1d645327cb35a44e3 Mon Sep 17 00:00:00 2001
From: Miguel Balparda <miguel.balparda@moozo.com.ar>
Date: Tue, 21 Aug 2018 09:46:46 -0300
Subject: [PATCH 7/7] Bump version for new release.

---
 app/code/community/Nexcessnet/Turpentine/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Nexcessnet/Turpentine/etc/config.xml b/app/code/community/Nexcessnet/Turpentine/etc/config.xml
index 4a18b6436..55082bd31 100644
--- a/app/code/community/Nexcessnet/Turpentine/etc/config.xml
+++ b/app/code/community/Nexcessnet/Turpentine/etc/config.xml
@@ -20,7 +20,7 @@
 <config>
     <modules>
         <Nexcessnet_Turpentine>
-            <version>0.7.3</version>
+            <version>0.7.4</version>
         </Nexcessnet_Turpentine>
     </modules>
     <default>