]> granicus.if.org Git - apache/commitdiff
2.4-only: remove 2.3.9/2.3.10 trivia
authorEric Covener <covener@apache.org>
Sun, 20 Apr 2014 13:14:34 +0000 (13:14 +0000)
committerEric Covener <covener@apache.org>
Sun, 20 Apr 2014 13:14:34 +0000 (13:14 +0000)
Merge r1588747 from trunk:

expr=value updates:
 update RequestHeader syntax,
 add compat to Header and RequestHeader

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1588748 13f79535-47bb-0310-9956-ffa450edef68

docs/manual/mod/mod_headers.xml

index 8cdce9452e23f0dd28af9acd12eb7a8454e72da2..ddeec40b71c230bef190463f646c87045434cb46 100644 (file)
@@ -200,13 +200,14 @@ Header merge Cache-Control no-store env=NO_STORE
 <name>RequestHeader</name>
 <description>Configure HTTP request headers</description>
 <syntax>RequestHeader add|append|edit|edit*|merge|set|setifempty|unset
-<var>header</var> [<var>value</var>] [<var>replacement</var>]
+<var>header</var> [[expr=]<var>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>SetIfEmpty available in 2.4.7 and later</compatibility>
+<compatibility>SetIfEmpty available in 2.4.7 and later, expr= value 
+available in 2.4.10 and later</compatibility>
 
 <usage>
     <p>This directive can replace, merge, change or remove HTTP request
@@ -310,14 +311,14 @@ 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|setifempty|unset|note
-<var>header</var> [<var>[expr=]value]</var>] [<var>replacement</var>]
+<var>header</var> [[expr=]<var>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.<br />
-SetIfEmpty and note available in 2.4.7 and later.</compatibility>
+<compatibility>SetIfEmpty available in 2.4.7 and later, expr= value 
+available in 2.4.10 and later</compatibility>
 
 <usage>
     <p>This directive can replace, merge or remove HTTP response