From: Chris Darroch Date: Tue, 21 Aug 2007 23:26:23 +0000 (+0000) Subject: update transformation X-Git-Tag: 2.3.0~1576 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ee539f5b21f4208061ba3b56e6002879687a290;p=thirdparty%2Fapache%2Fhttpd.git update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@568324 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_dbd.html.en b/docs/manual/mod/mod_dbd.html.en index e7ea3a13bb6..3d59f0888e8 100644 --- a/docs/manual/mod/mod_dbd.html.en +++ b/docs/manual/mod/mod_dbd.html.en @@ -209,12 +209,12 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c

DBDPersist Directive

- +
Description:Whether to use persistent connections
Syntax:DBDPersist 0|1
Syntax:DBDPersist On|Off
Context:server config, virtual host
Status:Extension
Module:mod_dbd
-

If set to 0, persistent and pooled connections are disabled. +

If set to Off, persistent and pooled connections are disabled. A new database connection is opened when requested by a client, and closed immediately on release. This option is for debugging and low-usage servers.

diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en index b004468b697..98b37db5b1c 100644 --- a/docs/manual/mod/mod_headers.html.en +++ b/docs/manual/mod/mod_headers.html.en @@ -109,7 +109,7 @@ headers bottlenecks between the client and the server.

- Header add MyHeader "%D %t" + Header set MyHeader "%D %t"

results in this header being added to the response:

@@ -123,7 +123,7 @@ headers Say hello to Joe

- Header add MyHeader "Hello Joe. It took %D microseconds \
+ Header set MyHeader "Hello Joe. It took %D microseconds \
for Apache to serve this request."

@@ -137,38 +137,69 @@ headers
  • Conditionally send MyHeader on the response if and - only if header "MyRequestHeader" is present on the request. This - is useful for constructing headers in response to some client + only if header MyRequestHeader is present on the request. + This is useful for constructing headers in response to some client stimulus. Note that this example requires the services of the mod_setenvif module.

    - SetEnvIf MyRequestHeader value HAVE_MyRequestHeader
    - Header add MyHeader "%D %t mytext" env=HAVE_MyRequestHeader
    -

    + SetEnvIf MyRequestHeader myvalue HAVE_MyRequestHeader
    + Header set MyHeader "%D %t mytext" env=HAVE_MyRequestHeader +

    • -

    If the header MyRequestHeader: value is present on - the HTTP request, the response will contain the following header:

    +

    If the header MyRequestHeader: myvalue is present on + the HTTP request, the response will contain the following header:

    -

    - MyHeader: D=3775428 t=991424704447256 mytext -

    +

    + MyHeader: D=3775428 t=991424704447256 mytext +

    -
  • Enable DAV to work with Apache running HTTP through SSL hardware - (problem description) by replacing https: with - http: in the Destination header: -

    - RequestHeader edit Destination ^https: http: early -

    + +
  • + Enable DAV to work with Apache running HTTP through SSL hardware + (problem + description) by replacing https: with + http: in the Destination header: + +

    + RequestHeader edit Destination ^https: http: early +

    • +
  • + Set the same header value under multiple non-exclusive conditions, + but do not duplicate the value in the final header. + If all of the following conditions applied to a request (i.e., + if the CGI, NO_CACHE and + NO_STORE environment variables all existed for the + request): + +

    + Header merge Cache-Control no-cache env=CGI
    + Header merge Cache-Control no-cache env=NO_CACHE
    + Header merge Cache-Control no-store env=NO_STORE +

    + +

    then the response would contain the following header:

    + +

    + Cache-Control: no-cache, no-store +

    + +

    If append was used instead of merge, + then the response would contain the following header:

    + +

    + Cache-Control: no-cache, no-cache, no-store +

    +
    • top

    Header Directive

    - @@ -201,12 +232,22 @@ headers header it is separated from the existing header with a comma. This is the HTTP standard way of giving a header multiple values. +
    merge
    +
    The response header is appended to any existing header of + the same name, unless the value to be appended already appears in the + header's comma-delimited list of values. When a new value is merged onto + an existing header it is separated from the existing header with a comma. + This is the HTTP standard way of giving a header multiple values. + Values are compared in a case sensitive manner, and after + 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 "append" should be - used instead.
    + unforeseen consequences, and in general set, + append or merge should be used instead.
    unset
    The response header of this name is removed, if it exists. @@ -215,7 +256,7 @@ headers
    echo
    Request headers with this name are echoed back in the - response headers. header may be a + response headers. header may be a regular expression. value must be omitted.
    @@ -228,14 +269,16 @@ headers

    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, add - and unset. The header name for echo - is case sensitive and may be a regular + ignored for set, append, merge, + add, unset and edit. + The header name for echo + is case sensitive and may be a regular expression.

    -

    For add, append and set a - value is specified as the third argument. If value - contains spaces, it should be surrounded by doublequotes. +

    For set, append, merge and + add a value is specified as the third argument. + If value + contains spaces, it should be surrounded by double quotes. value may be a character string, a string containing format specifiers or a combination of both. The following format specifiers are supported in value:

    @@ -266,7 +309,7 @@ headers +StdEnvVars. If SSLOptions +StdEnvVars must be enabled anyway for some other reason, %e will be more efficient than %s.

    - +

    For edit there is both a value argument which is a regular expression, @@ -294,7 +337,7 @@ headers

    RequestHeader Directive

    Description:Configure HTTP response headers
    Syntax:Header [condition] set|append|add|unset|echo|edit +
    Syntax:Header [condition] set|append|merge|add|unset|echo|edit header [value] [early|env=[!]variable]
    Context:server config, virtual host, directory, .htaccess
    Override:FileInfo
    - @@ -319,12 +362,22 @@ headers is the HTTP standard way of giving a header multiple values. +
    merge
    +
    The response header is appended to any existing header of + the same name, unless the value to be appended already appears in the + existing header's comma-delimited list of values. When a new value is + merged onto an existing header it is separated from the existing header + with a comma. This is the HTTP standard way of giving a header multiple + values. Values are compared in a case sensitive manner, and after + 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 append should be - used instead.
    + unforeseen consequences, and in general set, + append or merge should be used instead.
    unset
    The request header of this name is removed, if it exists. If @@ -340,10 +393,10 @@ headers

    This argument is followed by a header name, which can include the final colon, but it is not required. Case is - ignored. For add, append and - set a value is given as the third argument. If a + ignored. For set, append, merge and + add a value is given as the third argument. If a value contains spaces, it should be surrounded by double - quotes. For unset, no value should be given. + quotes. For unset, no value should be given. value may be a character string, a string containing format specifiers or a combination of both. The supported format specifiers are the same as for the Header, diff --git a/docs/manual/mod/mod_headers.xml.ja b/docs/manual/mod/mod_headers.xml.ja index 3d6614d64cc..19ca573855c 100644 --- a/docs/manual/mod/mod_headers.xml.ja +++ b/docs/manual/mod/mod_headers.xml.ja @@ -1,7 +1,7 @@ - + +

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