Completed
Pull Request — master (#1289)
by
unknown
03:10
created
contrib/tools/esi-decoder.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
-     * ESI DECODER
4
-     *
5
-     * This tool can be used to decode an ESI request.
6
-     * You can just paste the whole ESI URL and push the button to decode it.
7
-     *
8
-     * Make sure you place this utility on a protected spot on your web server where only authorized users can use it.
9
-     *
10
-     * If the URLs you see in "varnishlog" or "varnishncsa" are not working because they are cut off, read this FAQ item:
11
-     * https://github.com/nexcess/magento-turpentine/wiki/FAQ#im-using-varnishncsa-to-generate-logs-and-the-esi-urls-are-cut-off-how-do-i-get-the-full-url-in-the-logs
12
-     *
13
-     */
3
+ * ESI DECODER
4
+ *
5
+ * This tool can be used to decode an ESI request.
6
+ * You can just paste the whole ESI URL and push the button to decode it.
7
+ *
8
+ * Make sure you place this utility on a protected spot on your web server where only authorized users can use it.
9
+ *
10
+ * If the URLs you see in "varnishlog" or "varnishncsa" are not working because they are cut off, read this FAQ item:
11
+ * https://github.com/nexcess/magento-turpentine/wiki/FAQ#im-using-varnishncsa-to-generate-logs-and-the-esi-urls-are-cut-off-how-do-i-get-the-full-url-in-the-logs
12
+ *
13
+ */
14 14
 
15 15
 $tries = 5;
16 16
 $dir = dirname(__FILE__);
Please login to merge, or discard this patch.
app/code/community/Nexcessnet/Turpentine/Model/Core/Session.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
      */
57 57
     public function renewFormKey()
58 58
     {
59
-     	$this->setData('_form_key', Mage::helper('core')->getRandomString(16));
59
+            $this->setData('_form_key', Mage::helper('core')->getRandomString(16));
60 60
     }
61 61
 
62 62
     /**
Please login to merge, or discard this patch.
community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Abstract.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -894,8 +894,8 @@
 block discarded – undo
894 894
      */
895 895
     protected function _vcl_sub_https_redirect_fix() {
896 896
         $baseUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB);
897
-        $baseUrl = str_replace(array('http://','https://'), '', $baseUrl);
898
-        $baseUrl = rtrim($baseUrl,'/');
897
+        $baseUrl = str_replace(array('http://', 'https://'), '', $baseUrl);
898
+        $baseUrl = rtrim($baseUrl, '/');
899 899
         
900 900
         $tpl = <<<EOS
901 901
 if ( (req.http.host ~ "^(?i)www.$baseUrl" || req.http.host ~ "^(?i)$baseUrl") && req.http.X-Forwarded-Proto !~ "(?i)https") {
Please login to merge, or discard this patch.