diff options
| author | mh <mh@immerda.ch> | 2014-04-28 14:32:37 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-04-28 14:32:37 +0200 |
| commit | ccf10e2a2831141472d2c71ada7c29d8834bb072 (patch) | |
| tree | c82921a2ece948dfdc66657eed0426ec54e39aec /templates | |
| parent | ec203880b50e58dae5159e7279d0d14ec4b0b5d6 (diff) | |
do not forward if https is already set as forwarded header
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vhosts/php_typo3/partial.erb | 3 |
1 files changed, 2 insertions, 1 deletions
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> |