Commit d0b14549 authored by Fabrizio Furano's avatar Fabrizio Furano
Browse files

Merge branch 'disable-http-trace-without-rewrite' into 'develop'

Disable HTTP TRACE with TraceEnable instead of RewriteRule

See merge request !58
parents f41eec52 63fef0ed
......@@ -192,9 +192,7 @@ DiskDMLite /etc/dmlite-disk.conf
#
<VirtualHost *:80>
KeepAlive on
RewriteEngine on
RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
RewriteRule .* - [F]
TraceEnable off
</VirtualHost>
#
......@@ -207,9 +205,7 @@ Listen 443
<VirtualHost *:443>
KeepAlive on
RewriteEngine on
RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
RewriteRule .* - [F]
TraceEnable off
LoadModule ssl_module modules/mod_ssl.so
......
......@@ -242,9 +242,7 @@ Listen <%= @dav_http_port %>
<% end -%>
<VirtualHost *:<%= @dav_http_port %>>
KeepAlive on
RewriteEngine on
RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
RewriteRule .* - [F]
TraceEnable off
</VirtualHost>
<% end -%>
......@@ -259,9 +257,7 @@ Listen <%= @dav_https_port %>
<VirtualHost *:<%= @dav_https_port %>>
KeepAlive on
RewriteEngine on
RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
RewriteRule .* - [F]
TraceEnable off
LoadModule ssl_module modules/mod_ssl.so
......
......@@ -57,10 +57,7 @@ Listen <%= @dav_http_port %>
<VirtualHost *:<%= @dav_http_port %>>
KeepAlive on
RewriteEngine on
RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
RewriteRule .* - [F]
TraceEnable off
<% if @enable_disk -%>
DiskDMLite <%= @dmlite_disk_conf %>
......@@ -120,9 +117,7 @@ Listen <%= @dav_https_port %>
<VirtualHost *:<%= @dav_https_port %>>
KeepAlive on
RewriteEngine on
RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
RewriteRule .* - [F]
TraceEnable off
LoadModule ssl_module modules/mod_ssl.so
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment