From cca2d66b122f66b91684f6de386e4dc4fbd35d64 Mon Sep 17 00:00:00 2001 From: Rich Bowen Date: Fri, 5 Dec 2008 02:14:22 +0000 Subject: [PATCH] Put the arguments to Header, RequestHeader, in alphabetic order. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723560 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_headers.html.en | 81 +++++++++++++-------------- docs/manual/mod/mod_headers.xml | 85 +++++++++++++++-------------- 2 files changed, 84 insertions(+), 82 deletions(-) diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en index 14b10ecdcf..0113ef1ada 100644 --- a/docs/manual/mod/mod_headers.html.en +++ b/docs/manual/mod/mod_headers.html.en @@ -199,7 +199,7 @@ headers

Header Directive

- @@ -222,9 +222,12 @@ headers argument. This can be one of the following values:

-
set
-
The response header is set, replacing any previous header - with this name. The value may be a format string.
+
add
+
The response header is added to the existing set of headers, + even if this header already exists. This can result in two + (or more) headers having the same name. This can lead to + unforeseen consequences, and in general set, + append or merge should be used instead.
append
The response header is appended to any existing header of @@ -232,6 +235,19 @@ headers header it is separated from the existing header with a comma. This is the HTTP standard way of giving a header multiple values.
+
echo
+
Request headers with this name are echoed back in the + response headers. header may be a + regular expression. + value must be omitted.
+ +
edit
+
If this request header exists, its value is transformed according + to a regular expression + search-and-replace. The value argument is a regular expression, and the replacement + is a replacement string, which may contain backreferences.
+
+
merge
The response header is appended to any existing header of the same name, unless the value to be appended already appears in the @@ -242,31 +258,15 @@ headers all format specifiers have been processed. Values in double quotes are considered different from otherwise identical unquoted values.
-
add
-
The response header is added to the existing set of headers, - even if this header already exists. This can result in two - (or more) headers having the same name. This can lead to - unforeseen consequences, and in general set, - append or merge should be used instead.
+
set
+
The response header is set, replacing any previous header + with this name. The value may be a format string.
unset
The response header of this name is removed, if it exists. If there are multiple headers of the same name, all will be removed. value must be omitted.
-
echo
-
Request headers with this name are echoed back in the - response headers. header may be a - regular expression. - value must be omitted.
- -
edit
-
If this request header exists, its value is transformed according - to a regular expression - search-and-replace. The value argument is a regular expression, and the replacement - is a replacement string, which may contain backreferences.
- -

This argument is followed by a header name, which can include the final colon, but it is not required. Case is ignored for set, append, merge, @@ -337,7 +337,7 @@ headers

RequestHeader Directive

Description:Configure HTTP response headers
Syntax:Header [condition] set|append|merge|add|unset|echo|edit +
Syntax:Header [condition] add|append|echo|edit|merge|set|unset header [value] [early|env=[!]variable]
Context:server config, virtual host, directory, .htaccess
Override:FileInfo
- @@ -351,9 +351,13 @@ headers of the following values:

-
set
-
The request header is set, replacing any previous header - with this name
+ +
add
+
The request header is added to the existing set of headers, + even if this header already exists. This can result in two + (or more) headers having the same name. This can lead to + unforeseen consequences, and in general set, + append or merge should be used instead.
append
The request header is appended to any existing header of the @@ -362,6 +366,13 @@ headers is the HTTP standard way of giving a header multiple values.
+
edit
+
If this request header exists, its value is transformed according + to a regular expression + search-and-replace. The value argument is a regular expression, and the replacement + is a replacement string, which may contain backreferences.
+
+
merge
The response header is appended to any existing header of the same name, unless the value to be appended already appears in the @@ -372,25 +383,15 @@ headers all format specifiers have been processed. Values in double quotes are considered different from otherwise identical unquoted values.
-
add
-
The request header is added to the existing set of headers, - even if this header already exists. This can result in two - (or more) headers having the same name. This can lead to - unforeseen consequences, and in general set, - append or merge should be used instead.
+
set
+
The request header is set, replacing any previous header + with this name
unset
The request header of this name is removed, if it exists. If there are multiple headers of the same name, all will be removed. value must be omitted.
-
edit
-
If this request header exists, its value is transformed according - to a regular expression - search-and-replace. The value argument is a regular expression, and the replacement - is a replacement string, which may contain backreferences.
- -

This argument is followed by a header name, which can include the final colon, but it is not required. Case is ignored. For set, append, merge and diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml index b5d9fcb2c3..1e9e0063fc 100644 --- a/docs/manual/mod/mod_headers.xml +++ b/docs/manual/mod/mod_headers.xml @@ -187,7 +187,7 @@ headers RequestHeader Configure HTTP request headers -RequestHeader set|append|merge|add|unset|edit header +RequestHeader add|append|edit|merge|set|unset header [value] [replacement] [early|env=[!]variable] server configvirtual host directory.htaccess @@ -201,9 +201,13 @@ headers of the following values:

-
set
-
The request header is set, replacing any previous header - with this name
+ +
add
+
The request header is added to the existing set of headers, + even if this header already exists. This can result in two + (or more) headers having the same name. This can lead to + unforeseen consequences, and in general set, + append or merge should be used instead.
append
The request header is appended to any existing header of the @@ -212,6 +216,14 @@ headers is the HTTP standard way of giving a header multiple values.
+
edit
+
If this request header exists, its value is transformed according + to a regular expression + search-and-replace. The value argument is a regular expression, and the replacement + is a replacement string, which may contain backreferences.
+
+
merge
The response header is appended to any existing header of the same name, unless the value to be appended already appears in the @@ -222,26 +234,15 @@ headers all format specifiers have been processed. Values in double quotes are considered different from otherwise identical unquoted values.
-
add
-
The request header is added to the existing set of headers, - even if this header already exists. This can result in two - (or more) headers having the same name. This can lead to - unforeseen consequences, and in general set, - append or merge should be used instead.
+
set
+
The request header is set, replacing any previous header + with this name
unset
The request header of this name is removed, if it exists. If there are multiple headers of the same name, all will be removed. value must be omitted.
-
edit
-
If this request header exists, its value is transformed according - to a regular expression - search-and-replace. The value argument is a regular expression, and the replacement - is a replacement string, which may contain backreferences.
- -

This argument is followed by a header name, which can include the final colon, but it is not required. Case is ignored. For set, append, merge and @@ -278,7 +279,7 @@ headers Header Configure HTTP response headers -Header [condition] set|append|merge|add|unset|echo|edit +Header [condition] add|append|echo|edit|merge|set|unset header [value] [early|env=[!]variable] server configvirtual host directory.htaccess @@ -301,9 +302,12 @@ headers argument. This can be one of the following values:

-
set
-
The response header is set, replacing any previous header - with this name. The value may be a format string.
+
add
+
The response header is added to the existing set of headers, + even if this header already exists. This can result in two + (or more) headers having the same name. This can lead to + unforeseen consequences, and in general set, + append or merge should be used instead.
append
The response header is appended to any existing header of @@ -311,6 +315,20 @@ headers header it is separated from the existing header with a comma. This is the HTTP standard way of giving a header multiple values.
+
echo
+
Request headers with this name are echoed back in the + response headers. header may be a + regular expression. + value must be omitted.
+ +
edit
+
If this request header exists, its value is transformed according + to a regular expression + search-and-replace. The value argument is a regular expression, and the replacement + is a replacement string, which may contain backreferences.
+
+
merge
The response header is appended to any existing header of the same name, unless the value to be appended already appears in the @@ -321,32 +339,15 @@ headers all format specifiers have been processed. Values in double quotes are considered different from otherwise identical unquoted values.
-
add
-
The response header is added to the existing set of headers, - even if this header already exists. This can result in two - (or more) headers having the same name. This can lead to - unforeseen consequences, and in general set, - append or merge should be used instead.
+
set
+
The response header is set, replacing any previous header + with this name. The value may be a format string.
unset
The response header of this name is removed, if it exists. If there are multiple headers of the same name, all will be removed. value must be omitted.
-
echo
-
Request headers with this name are echoed back in the - response headers. header may be a - regular expression. - value must be omitted.
- -
edit
-
If this request header exists, its value is transformed according - to a regular expression - search-and-replace. The value argument is a regular expression, and the replacement - is a replacement string, which may contain backreferences.
- -

This argument is followed by a header name, which can include the final colon, but it is not required. Case is ignored for set, append, merge, -- 2.40.0

Description:Configure HTTP request headers
Syntax:RequestHeader set|append|merge|add|unset|edit header +
Syntax:RequestHeader add|append|edit|merge|set|unset header [value] [replacement] [early|env=[!]variable]
Context:server config, virtual host, directory, .htaccess
Override:FileInfo