Skip to content

Commit ed52af7

Browse files
committed
Only add SSLProxyEngine in proxy mode and when SSL is enabled for the web (fixes #6269)
SSLProxyEngine is neither needed for http(s) redirects nor for non-SSL proxy configs. Thus excluding it from these cases. Based on a fix by Thom <thom@amsterdamtech.nl>
1 parent 19b24c6 commit ed52af7

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

server/conf/vhost.conf.master

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,12 @@
517517
RewriteCond %{REQUEST_URI} !^/php-fcgi/
518518
RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
519519
</tmpl_if>
520+
<tmpl_if name='use_proxy_protocol' op='==' value='y'>
521+
<tmpl_if name='ssl_enabled'>
520522
<tmpl_if name="rewrite_target_is_ssl" op="==" value="y">
521523
SSLProxyEngine On
524+
</tmpl_if>
525+
</tmpl_if>
522526
</tmpl_if>
523527

524528
RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if> <tmpl_var name='rewrite_type'>

0 commit comments

Comments
 (0)