From ccf10e2a2831141472d2c71ada7c29d8834bb072 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Mon, 28 Apr 2014 14:32:37 +0200
Subject: do not forward if https is already set as forwarded header

---
 templates/vhosts/php_typo3/partial.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/vhosts/php_typo3/partial.erb b/templates/vhosts/php_typo3/partial.erb
index edb2966..afb756d 100644
--- a/templates/vhosts/php_typo3/partial.erb
+++ b/templates/vhosts/php_typo3/partial.erb
@@ -4,6 +4,7 @@
 
     # Rewrite URLs to https that go for the admin area
     RewriteCond %{HTTPS} !=on
+    RewriteCond %{HTTP:X-Forwarded-Proto} !=https
     RewriteCond %{REQUEST_URI} (.*/typo3/.*)
-    RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R]
+    RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R,NE]
   </Directory>
-- 
cgit v1.2.3