From 62c601a8de82bfcfe8272cea258d04eba68a617c Mon Sep 17 00:00:00 2001 From: Andre Malo Date: Tue, 12 Nov 2002 03:48:00 +0000 Subject: [PATCH] - -> - some reformatting git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97491 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_env.xml | 78 +++++++++++------------ docs/manual/mod/mod_expires.xml | 109 ++++++++++++++------------------ 2 files changed, 87 insertions(+), 100 deletions(-) diff --git a/docs/manual/mod/mod_env.xml b/docs/manual/mod/mod_env.xml index 6fdf2c661f3..b541a5430f0 100644 --- a/docs/manual/mod/mod_env.xml +++ b/docs/manual/mod/mod_env.xml @@ -4,76 +4,74 @@ mod_env - Modifies the environment which is - passed to CGI scripts and SSI pages - Base - mod_env.c - env_module - +Modifies the environment which is passed to CGI scripts and +SSI pages +Base +mod_env.c +env_module +

This module allows for control of the environment that will be provided to CGI scripts and SSI pages. Environment variables may be passed from the shell which invoked the httpd process. Alternatively, environment variables may be set or unset within the configuration process.

- - Environment Variables + +Environment Variables - - PassEnv - Passes environment variables from the shell - PassEnv - env-variable [env-variable] ... - - server configvirtual host - directory.htaccess - - FileInfo + +PassEnv +Passes environment variables from the shell +PassEnv env-variable [env-variable] +... +server configvirtual host +directory.htaccess +FileInfo

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 + SetEnv Sets environment variables -SetEnv env-variable value - -server configvirtual host -directory.htaccess - +SetEnv env-variable value +server configvirtual host +directory.htaccess FileInfo

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 + UnsetEnv Removes variables from the environment -UnsetEnv env-variable [env-variable] ... - -server configvirtual host -directory.htaccess - +UnsetEnv env-variable [env-variable] +... +server configvirtual host +directory.htaccess FileInfo

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 + diff --git a/docs/manual/mod/mod_expires.xml b/docs/manual/mod/mod_expires.xml index 1a334d1dea4..58a214b411f 100644 --- a/docs/manual/mod/mod_expires.xml +++ b/docs/manual/mod/mod_expires.xml @@ -4,9 +4,8 @@ mod_expires -Generation of - Expires HTTP headers according to user-specified - criteria +Generation of Expires HTTP headers according to +user-specified criteria Extension mod_expires.c expires_module @@ -25,19 +24,17 @@ must be obtained from the source.

-
Alternate Interval - Syntax - -

The ExpiresDefault and +

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:

@@ -50,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
    @@ -74,21 +65,21 @@ 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 @@ -98,7 +89,8 @@ ExpiresByType text/html "access plus 1 month 15 ExpiresActive -Enables generation of Expires headers +Enables generation of Expires +headers ExpiresActive On|Off server config virtual hostdirectory @@ -110,12 +102,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.).

    @@ -131,47 +122,46 @@ ExpiresByType text/html "access plus 1 month 15 ExpiresByType Value of the Expires header configured by MIME type -ExpiresByType - MIME-type <code>seconds -server config -virtual hostdirectory -.htaccess +ExpiresByType MIME-type +<code>seconds +server configvirtual host +directory.htaccess Indexes

    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, @@ -188,10 +178,9 @@ ExpiresByType text/html M604800 ExpiresDefault Default algorithm for calculating expiration time -ExpiresDefault <code>seconds -server config -virtual hostdirectory -.htaccess +ExpiresDefault <code>seconds +server configvirtual host +directory.htaccess Indexes -- 2.47.3