summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2013-12-01 12:23:22 +0100
committerEric Covener <covener@apache.org>2013-12-01 12:23:22 +0100
commitd5174b9fcdfaa325960892575c358181c07d60f6 (patch)
tree95724f508fba86458726403c7b6bfab74ea06d8a /docs
parent2.4.x CHANGES was updated in r1546547 to cover these entries (diff)
downloadapache2-d5174b9fcdfaa325960892575c358181c07d60f6.tar.xz
apache2-d5174b9fcdfaa325960892575c358181c07d60f6.zip
If the "value" argument is prefixed with expr=, parse it with ap_expr
rather than mod_headers' built-in format strings. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546801 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs')
-rw-r--r--docs/manual/mod/mod_headers.xml12
1 files changed, 7 insertions, 5 deletions
diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index d10b6ef7c8..8e0087b4df 100644
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -301,13 +301,12 @@ Header merge Cache-Control no-store env=NO_STORE
<name>Header</name>
<description>Configure HTTP response headers</description>
<syntax>Header [<var>condition</var>] add|append|echo|edit|edit*|merge|set|unset|note
-<var>header</var> [<var>value</var>] [<var>replacement</var>]
+<var>header</var> [<var>[expr=]value]</var>] [<var>replacement</var>]
[early|env=[!]<var>variable</var>]|expr=<var>expression</var>]
</syntax>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
-<compatibility>Default condition was temporarily changed to "always" in 2.3.9 and 2.3.10</compatibility>
<usage>
<p>This directive can replace, merge or remove HTTP response
@@ -421,9 +420,12 @@ Header merge Cache-Control no-store env=NO_STORE
<code>add</code> a <var>value</var> is specified as the next argument.
If <var>value</var>
contains spaces, it should be surrounded by double quotes.
- <var>value</var> may be a character string, a string containing format
- specifiers or a combination of both. The following format specifiers
- are supported in <var>value</var>:</p>
+ <var>value</var> may be a character string, a string containing
+ <module>mod_headers</module> specific format specifiers (and character
+ literals), or an <a href="../expr.html">ap_expr</a> expression prefixed
+ with <em>expr=</em></p>
+
+ <p> The following format specifiers are supported in <var>value</var>:</p>
<table border="1" style="zebra">
<columnspec><column width=".25"/><column width=".75"/></columnspec>