From 77d77183d5f98d790193cc56933d08817a707047 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Tue, 12 Nov 2002 03:56:12 +0000 Subject: [PATCH] update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97492 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/index.html.en | 9 +-- docs/manual/mod/mod_env.html.en | 42 ++++++----- docs/manual/mod/mod_expires.html.en | 100 +++++++++++-------------- docs/manual/mod/quickreference.html.en | 18 +++-- 4 files changed, 82 insertions(+), 87 deletions(-) diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en index 9e81484333..b0698d6323 100644 --- a/docs/manual/mod/index.html.en +++ b/docs/manual/mod/index.html.en @@ -61,12 +61,11 @@ client serving directory index files
mod_echo
A simple echo server to illustrate protocol modules
-
mod_env
Modifies the environment which is - passed to CGI scripts and SSI pages
+
mod_env
Modifies the environment which is passed to CGI scripts and +SSI pages
mod_example
Illustrates the Apache module API
-
mod_expires
Generation of - Expires HTTP headers according to user-specified - criteria
+
mod_expires
Generation of Expires HTTP headers according to +user-specified criteria
mod_ext_filter
Pass the response body through an external program before delivery to the client
diff --git a/docs/manual/mod/mod_env.html.en b/docs/manual/mod/mod_env.html.en index 8ca8bdcd08..9e51b61f67 100644 --- a/docs/manual/mod/mod_env.html.en +++ b/docs/manual/mod/mod_env.html.en @@ -5,8 +5,8 @@ This file is generated from xml source: DO NOT EDIT XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -->mod_env - Apache HTTP Server
<-
Apache > HTTP Server > Documentation > Version 2.0 > Modules

Apache Module mod_env

Description: - Modifies the environment which is - passed to CGI scripts and SSI pages
Status: + Modifies the environment which is passed to CGI scripts and +SSI pages
Status: Base
Module Identifier: env_module
Source File: mod_env.c

Summary

@@ -15,45 +15,49 @@ may be passed from the shell which invoked the httpd process. Alternatively, environment variables may be set or unset within the configuration process.

-

Directives

top

PassEnv Directive

Description: Passes environment variables from the shell
Syntax: - PassEnv - env-variable [env-variable] ...
Context: + PassEnv env-variable [env-variable] +...
Context: server config, virtual host, directory, .htaccess
Override: FileInfo
Status: Base
Module: mod_env

Specifies one or more environment variables to pass to CGI scripts and SSI pages from the environment of the shell which - invoked the httpd process. Example:

-

- PassEnv LD_LIBRARY_PATH -

+ invoked the httpd process.

+ +

Example

+ PassEnv LD_LIBRARY_PATH +

top

SetEnv Directive

Description: Sets environment variables
Syntax: - SetEnv env-variable value
Context: + SetEnv env-variable value
Context: server config, virtual host, directory, .htaccess
Override: FileInfo
Status: Base
Module: mod_env

Sets an environment variable, which is then passed on to CGI - scripts and SSI pages. Example:

-

- SetEnv SPECIAL_PATH /foo/bin -

+ scripts and SSI pages.

+ +

Example

+ SetEnv SPECIAL_PATH /foo/bin +

top

UnsetEnv Directive

Description: Removes variables from the environment
Syntax: - UnsetEnv env-variable [env-variable] ...
Context: + UnsetEnv env-variable [env-variable] +...
Context: server config, virtual host, directory, .htaccess
Override: FileInfo
Status: Base
Module: mod_env

Removes one or more environment variables from those passed - on to CGI scripts and SSI pages. Example:

-

- UnsetEnv LD_LIBRARY_PATH -

+ on to CGI scripts and SSI pages.

+ +

Example

+ UnsetEnv LD_LIBRARY_PATH +

\ No newline at end of file diff --git a/docs/manual/mod/mod_expires.html.en b/docs/manual/mod/mod_expires.html.en index a3deb3487c..8a97ed3231 100644 --- a/docs/manual/mod/mod_expires.html.en +++ b/docs/manual/mod/mod_expires.html.en @@ -5,9 +5,8 @@ This file is generated from xml source: DO NOT EDIT XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -->mod_expires - Apache HTTP Server
<-
Apache > HTTP Server > Documentation > Version 2.0 > Modules

Apache Module mod_expires

Description: - Generation of - Expires HTTP headers according to user-specified - criteria
Status: + Generation of Expires HTTP headers according to +user-specified criteria
Status: Extension
Module Identifier: expires_module
Source File: mod_expires.c

Summary

@@ -25,20 +24,17 @@
top
top

Alternate Interval Syntax

+

The ExpiresDefault and ExpiresByType directives can also be defined in a more readable syntax of the form:

-

- ExpiresDefault "<base> [plus] {<num> +

+ ExpiresDefault "<base> [plus] {<num> <type>}*"
- ExpiresByType type/encoding "<base> [plus] + ExpiresByType type/encoding "<base> [plus] {<num> <type>}*" -

+

where <base> is one of:

@@ -51,23 +47,17 @@
  • modification
  • -

    The 'plus' keyword is optional. <num> +

    The plus keyword is optional. <num> should be an integer value [acceptable to atoi()], and <type> is one of:

    • years
    • -
    • months
    • -
    • weeks
    • -
    • days
    • -
    • hours
    • -
    • minutes
    • -
    • seconds
    @@ -75,28 +65,29 @@ make documents expire 1 month after being accessed, by default:

    -

    - ExpiresDefault "access plus 1 month"
    - ExpiresDefault "access plus 4 weeks"
    - ExpiresDefault "access plus 30 days" -

    +

    + ExpiresDefault "access plus 1 month"
    + ExpiresDefault "access plus 4 weeks"
    + ExpiresDefault "access plus 30 days" +

    The expiry time can be fine-tuned by adding several '<num> <type>' clauses:

    -

    -ExpiresByType text/html "access plus 1 month 15 +

    + ExpiresByType text/html "access plus 1 month 15 days 2 hours"
    - ExpiresByType image/gif "modification plus 5 hours 3 + ExpiresByType image/gif "modification plus 5 hours 3 minutes" -

    +

    Note that if you use a modification date based setting, the Expires header will not be added to content that does not come from a file on disk. This is due to the fact that there is no modification time for such content.

    top

    ExpiresActive Directive

    Description: - Enables generation of Expires headers
    Syntax: + Enables generation of Expires +headers
    Syntax: ExpiresActive On|Off
    Context: server config, virtual host, directory, .htaccess
    Override: Indexes
    Status: @@ -106,12 +97,11 @@ ExpiresByType text/html "access plus 1 month 15 Expires header for the document realm in question. (That is, if found in an .htaccess file, for instance, it applies only to documents generated from that - directory.) If set to Off, no - Expires header will be generated for any document - in the realm (unless overridden at a lower level, such as an - .htaccess file overriding a server config file). - If set to On, the header will be added to - served documents according to the criteria defined by the + directory.) If set to Off, no Expires header + will be generated for any document in the realm (unless overridden at + a lower level, such as an .htaccess file overriding a + server config file). If set to On, the header will be + added to served documents according to the criteria defined by the ExpiresByType and ExpiresDefault directives (q.v.).

    @@ -123,45 +113,45 @@ ExpiresByType text/html "access plus 1 month 15
    top

    ExpiresByType Directive

    Description: Value of the Expires header configured by MIME type
    Syntax: - ExpiresByType - MIME-type <code>seconds
    Context: + ExpiresByType MIME-type +<code>seconds
    Context: server config, virtual host, directory, .htaccess
    Override: Indexes
    Status: Extension
    Module: mod_expires

    This directive defines the value of the Expires - header generated for documents of the specified type - (e.g., text/html). The second argument - sets the number of seconds that will be added to a base time to - construct the expiration date.

    + header generated for documents of the specified type (e.g., + text/html). The second argument sets the number of + seconds that will be added to a base time to construct the expiration + date.

    The base time is either the last modification time of the file, or the time of the client's access to the document. Which should be used is specified by the - <code> field; M + <code> field; M means that the file's last modification time should be used as - the base time, and A means the client's access + the base time, and A means the client's access time should be used.

    -

    The difference in effect is subtle. If M is used, +

    The difference in effect is subtle. If M is used, all current copies of the document in all caches will expire at the same time, which can be good for something like a weekly - notice that's always found at the same URL. If A is + notice that's always found at the same URL. If A is used, the date of expiration is different for each client; this can be good for image files that don't change very often, particularly for a set of related documents that all refer to the same images (i.e., the images will be accessed repeatedly within a relatively short timespan).

    -

    Example:

    -

    -# enable expirations
    -ExpiresActive On
    -# expire GIF images after a month in the client's cache
    -ExpiresByType image/gif A2592000
    -# HTML documents are good for a week from the time they were changed
    -ExpiresByType text/html M604800 -

    +

    Example:

    + # enable expirations
    + ExpiresActive On
    + # expire GIF images after a month in the client's cache
    + ExpiresByType image/gif A2592000
    + # HTML documents are good for a week from the
    + # time they were changed
    + ExpiresByType text/html M604800 +

    Note that this directive only has effect if ExpiresActive On has been specified. It overrides, @@ -174,7 +164,7 @@ ExpiresByType text/html M604800 this document.

    top

    ExpiresDefault Directive

    - - + - + @@ -388,8 +389,8 @@ directory - + @@ -513,7 +514,7 @@ is accessed by an incompatible browser - + certain events before failing a request - +
    Description: Default algorithm for calculating expiration time
    Syntax: - ExpiresDefault <code>seconds
    Context: + ExpiresDefault <code>seconds
    Context: server config, virtual host, directory, .htaccess
    Override: Indexes
    Status: Extension
    Module: diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index a94a8b258d..ae8355a79f 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -246,11 +246,12 @@ in case of an error
    ErrorLog file-path|syslog[:facility] logs/error_log (Uni +svC
    Location where the server will log errors
    ExamplesvdhX
    Demonstration directive to illustrate the Apache module API
    ExpiresActive On|OffsvdhE
    Enables generation of Expires headers
    ExpiresByType - MIME-type <code>secondssvdhE
    Value of the Expires header configured +
    ExpiresActive On|OffsvdhE
    Enables generation of Expires +headers
    ExpiresByType MIME-type +<code>secondssvdhE
    Value of the Expires header configured by MIME type
    ExpiresDefault <code>secondssvdhE
    Default algorithm for calculating expiration time
    ExpiresDefault <code>secondssvdhE
    Default algorithm for calculating expiration time
    ExtendedStatus On|Off Off sB
    Keep track of extended status information for each request
    ExtFilterDefine filtername parameterssX
    -
    Order ordering Deny,Allow dhB
    Controls the default access state and the order in which Allow and Deny are evaluated.
    PassEnv - env-variable [env-variable] ...svdhB
    Passes environment variables from the shell
    PassEnv env-variable [env-variable] +...svdhB
    Passes environment variables from the shell
    PidFile filename logs/httpd.pid sM
    File where the server records the process ID of the daemon
    ProtocolEcho On|OffsvX
    Turn the echo server on or off
    ServerRoot directory-path /usr/local/apache sC
    Base directory for the server installation
    ServerSignature On|Off|EMail Off svdhC
    Configures the footer on server-generated documents
    ServerTokens Major|Minor|Minimal|ProductOnly|OS|Full Full sC
    Configures the Server HTTP response header
    SetEnv env-variable valuesvdhB
    Sets environment variables
    SetEnv env-variable valuesvdhB
    Sets environment variables
    SetEnvIf attribute regex [!]env-variable[=value] [[!]env-variable[=value]] ...svdhB
    Sets environment variables based on attributes of the request @@ -598,7 +599,8 @@ per child process
    TransferLog file|pipesvB
    Specifly location of a log file
    TypesConfig file-path conf/mime.types sB
    The location of the mime.types file
    UnsetEnv env-variable [env-variable] ...svdhB
    Removes variables from the environment
    UnsetEnv env-variable [env-variable] +...svdhB
    Removes variables from the environment
    UseCanonicalName on|off|dns on svdC
    Configures how the server determines its own name and port
    User unix-userid #-1 svM
    The userid under which the server will answer -- 2.40.0