]> granicus.if.org Git - apache/commitdiff
Fix mod_headers documentation:
authorRainer Jung <rjung@apache.org>
Sat, 11 Aug 2012 10:25:46 +0000 (10:25 +0000)
committerRainer Jung <rjung@apache.org>
Sat, 11 Aug 2012 10:25:46 +0000 (10:25 +0000)
- add expr= to syntax rule
- add optional replacement argument to Header syntax
- add "edit*" command to Header syntax
- add "edit*" explanation to Header directive

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1371903 13f79535-47bb-0310-9956-ffa450edef68

docs/manual/mod/mod_headers.xml

index c8ff3bdf3f29f29291ae88a5c4a00d4147202dc0..620ee5c90fdddec01cd3236333e155df63dfe504 100644 (file)
@@ -192,8 +192,10 @@ Header merge Cache-Control no-store env=NO_STORE
 <directivesynopsis>
 <name>RequestHeader</name>
 <description>Configure HTTP request headers</description>
-<syntax>RequestHeader add|append|edit|edit*|merge|set|unset <var>header</var>
-[<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</syntax>
+<syntax>RequestHeader add|append|edit|edit*|merge|set|unset
+<var>header</var> [<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>
@@ -294,8 +296,10 @@ Header merge Cache-Control no-store env=NO_STORE
 <directivesynopsis>
 <name>Header</name>
 <description>Configure HTTP response headers</description>
-<syntax>Header [<var>condition</var>] add|append|echo|edit|merge|set|unset
-<var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</syntax>
+<syntax>Header [<var>condition</var>] add|append|echo|edit|edit*|merge|set|unset
+<var>header</var> [<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>
@@ -359,11 +363,16 @@ Header merge Cache-Control no-store env=NO_STORE
     <var>value</var> must be omitted.</dd>
 
     <dt><code>edit</code></dt>
+    <dt><code>edit*</code></dt>
     <dd>If this response header exists, its value is transformed according
     to a <glossary ref="regex">regular expression</glossary>
     search-and-replace.  The <var>value</var> argument is a <glossary
     ref="regex">regular expression</glossary>, and the <var>replacement</var>
-    is a replacement string, which may contain backreferences.</dd>
+    is a replacement string, which may contain backreferences.
+    The <code>edit</code> form will match and replace exactly once
+    in a header value, whereas the <code>edit*</code> form will replace
+    <em>every</em> instance of the search pattern if it appears more
+    than once.</dd>
 
     <dt><code>merge</code></dt>
     <dd>The response header is appended to any existing header of