Skip to content

Commit a84601c

Browse files
committed
fix: fix apache cache_ignore_header regression
1 parent ce2a3a9 commit a84601c

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

templates/mod/cache.conf.epp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<% |
2-
Optional[String] $cache_ignore_headers = undef,
2+
Optional[Array[String[1]]] $cache_ignore_headers = undef,
33
Optional[Integer] $cache_default_expire = undef,
44
Optional[Integer] $cache_max_expire = undef,
55
Optional[Apache::OnOff] $cache_ignore_no_lastmod = undef,
@@ -26,5 +26,5 @@ CacheLock <%= $cache_lock %>
2626
CacheIgnoreCacheControl <%= $cache_ignore_cache_control %>
2727
<%- } -%>
2828
<%- if $cache_ignore_headers { -%>
29-
CacheIgnoreHeaders <%= $cache_ignore_headers -%>
29+
CacheIgnoreHeaders <% $cache_ignore_headers.each |$header| { %><%= $header %> <% } %>
3030
<%- } -%>

templates/mod/cache_disk.conf.epp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
Optional[Integer] $cache_dir_length = undef,
55
Optional[Integer] $cache_dir_levels = undef,
66
Optional[Integer] $cache_max_filesize = undef,
7-
Optional[String] $cache_ignore_headers = undef,
87
| -%>
98
<%- if $cache_enable { -%>
109
<%- $cache_enable.each |$enable| { -%>
@@ -21,6 +20,3 @@ CacheDirLength <%= $cache_dir_length %>
2120
<%- if $cache_max_filesize { -%>
2221
CacheMaxFileSize <%= $cache_max_filesize %>
2322
<%- } -%>
24-
<%- if $cache_ignore_headers { -%>
25-
CacheIgnoreHeaders <%= $cache_ignore_headers -%>
26-
<%- } -%>

0 commit comments

Comments
 (0)