From 1baf5c7f130d14d0ccdb29b45235eca7f569c86b Mon Sep 17 00:00:00 2001 From: Daniel Gruno Date: Thu, 26 Apr 2012 18:16:48 +0000 Subject: [PATCH] Syntax updates for mod_h*.xml, mod_i*.xml git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331006 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_headers.xml | 49 ++++++++++++----------- docs/manual/mod/mod_heartbeat.xml | 4 +- docs/manual/mod/mod_heartmonitor.xml | 4 +- docs/manual/mod/mod_imagemap.xml | 4 +- docs/manual/mod/mod_include.xml | 32 +++++++-------- docs/manual/mod/mod_info.xml | 58 +++++++++++++--------------- docs/manual/mod/mod_isapi.xml | 8 ++-- 7 files changed, 76 insertions(+), 83 deletions(-) diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml index f40bc05a2a..c8ff3bdf3f 100644 --- a/docs/manual/mod/mod_headers.xml +++ b/docs/manual/mod/mod_headers.xml @@ -47,10 +47,10 @@ headers href="../sections.html#mergin">configuration sections. These two directives have a different effect if reversed:

- - RequestHeader append MirrorID "mirror 12"
- RequestHeader unset MirrorID - + +RequestHeader append MirrorID "mirror 12" +RequestHeader unset MirrorID +

This way round, the MirrorID header is not set. If reversed, the MirrorID header is set to "mirror 12".

@@ -84,9 +84,9 @@ headers Copy all request headers that begin with "TS" to the response headers: - + Header echo ^TS - +
  • @@ -96,9 +96,9 @@ headers the client to intuit load on the server or in isolating bottlenecks between the client and the server. - + Header set MyHeader "%D %t" - +

    results in this header being added to the response:

    @@ -110,10 +110,9 @@ headers
  • Say hello to Joe - - Header set MyHeader "Hello Joe. It took %D microseconds \
    - for Apache to serve this request." -     + +Header set MyHeader "Hello Joe. It took %D microseconds for Apache to serve this request." +

    results in this header being added to the response:

    @@ -130,10 +129,10 @@ headers stimulus. Note that this example requires the services of the mod_setenvif module. - - SetEnvIf MyRequestHeader myvalue HAVE_MyRequestHeader
    - Header set 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: myvalue is present on the HTTP request, the response will contain the following header:

    @@ -149,9 +148,9 @@ headers description) by replacing https: with http: in the Destination header: - + RequestHeader edit Destination ^https: http: early - +
  • @@ -162,11 +161,11 @@ headers 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 -     + +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:

    @@ -183,9 +182,9 @@ headers
  • Set a test cookie if and only if the client didn't send us a cookie - + Header set Set-Cookie testcookie "expr=-z %{req:Cookie}" - +
    • diff --git a/docs/manual/mod/mod_heartbeat.xml b/docs/manual/mod/mod_heartbeat.xml index 70424f0e90..a2180aae4c 100644 --- a/docs/manual/mod/mod_heartbeat.xml +++ b/docs/manual/mod/mod_heartbeat.xml @@ -82,9 +82,9 @@ multicast address to which mod_heartbeat will send status information. This address will usually correspond to a configured HeartbeatListen on a frontend proxy system.

    - + HeartbeatAddress 239.0.0.1:27999 - + diff --git a/docs/manual/mod/mod_heartmonitor.xml b/docs/manual/mod/mod_heartmonitor.xml index 2870b1df12..b2577410d3 100644 --- a/docs/manual/mod/mod_heartmonitor.xml +++ b/docs/manual/mod/mod_heartmonitor.xml @@ -66,9 +66,9 @@ use mod_slotmem_shm.

    module="mod_heartbeat">HeartbeatAddress on an origin server.

    - + HeartbeatListen 239.0.0.1:27999 - +

    This module is inactive until this directive is used.

    diff --git a/docs/manual/mod/mod_imagemap.xml b/docs/manual/mod/mod_imagemap.xml index fab7a715d4..1b45ce8627 100644 --- a/docs/manual/mod/mod_imagemap.xml +++ b/docs/manual/mod/mod_imagemap.xml @@ -40,11 +40,11 @@

    The following directive will activate files ending with .map as imagemap files:

    - AddHandler imap-file map + AddHandler imap-file map

    Note that the following is still supported:

    - AddType application/x-httpd-imap map + AddType application/x-httpd-imap map

    However, we are trying to phase out "magic MIME types" so we are deprecating this method.

    diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml index dcf8eaa296..e0f9b86749 100644 --- a/docs/manual/mod/mod_include.xml +++ b/docs/manual/mod/mod_include.xml @@ -53,10 +53,10 @@ parse them and assign the resulting document the mime type of text/html:

    - - AddType text/html .shtml
    - AddOutputFilter INCLUDES .shtml -     + +AddType text/html .shtml +AddOutputFilter INCLUDES .shtml +

    The following directive must be given for the directories containing the shtml files (typically in a @@ -65,9 +65,9 @@ AllowOverride Options is set):

    - + Options +Includes - +

    For backwards compatibility, the server-parsed handler also activates the @@ -764,9 +764,9 @@

    This directive changes the string that mod_include looks for to mark the end of an include element.

    - Example + SSIEndTag "%>" - + SSIStartTag @@ -786,9 +786,9 @@

    This directive changes the string that mod_include displays when a variable is not set and "echoed".

    - Example + SSIUndefinedEcho "<!-- undef -->" - + @@ -814,9 +814,9 @@ directive]"

    This directive has the same effect as the <!--#config errmsg=message --> element.

    - Example + SSIErrorMsg "<!-- Error -->" - + @@ -837,10 +837,10 @@ directive]" output of a file each processing different commands (possibly at different times).

    - Example + SSIStartTag "<%"
    SSIEndTag "%>" -     +

    The example given above, which also specifies a matching SSIEndTag, will @@ -875,9 +875,9 @@ displayed

    This directive has the same effect as the <!--#config timefmt=formatstring --> element.

    - Example + SSITimeFormat "%R, %B %d, %Y" - +

    The above directive would cause times to be displayed in the format "22:26, June 14, 2002".

    diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml index 0bfd6d645b..519ed4b744 100644 --- a/docs/manual/mod/mod_info.xml +++ b/docs/manual/mod/mod_info.xml @@ -33,27 +33,23 @@ configuration

    To configure mod_info, add the following to your httpd.conf file.

    - - <Location /server-info>
    - - SetHandler server-info
    -     - </Location> -     + +<Location /server-info> + SetHandler server-info +</Location> +

    You may wish to use mod_access inside the Location directive to limit access to your server configuration information:

    - - <Location /server-info>
    - - SetHandler server-info
    - Require host example.com
    -     - </Location> -     + +<Location /server-info> + SetHandler server-info + Require host example.com +</Location> +

    Once configured, the server information is obtained by accessing http://your.host.example.com/server-info

    @@ -76,16 +72,16 @@ configuration to limit access to your server configuration information.

    Access control - <Location /server-info>
    - - SetHandler server-info
    - Order allow,deny
    - # Allow access from server itself
    - Allow from 127.0.0.1
    - # Additionally, allow access from local workstation
    - Allow from 192.168.1.17
    -     - </Location> + +<Location /server-info> + SetHandler server-info + Order allow,deny + # Allow access from server itself + Allow from 127.0.0.1 + # Additionally, allow access from local workstation + Allow from 192.168.1.17 +</Location> +     @@ -165,13 +161,11 @@ information displayed by the server-info handler HTML interpreted, Additional Information for the module module-name. Example:

    - - AddModuleInfo mod_deflate.c 'See <a \
    - - href="http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html">\
    - http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html</a>' -     -     + +AddModuleInfo mod_deflate.c 'See <a \ + href="http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html">\ + http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html</a>' + diff --git a/docs/manual/mod/mod_isapi.xml b/docs/manual/mod/mod_isapi.xml index 0e46499b41..9f4bdef4ea 100644 --- a/docs/manual/mod/mod_isapi.xml +++ b/docs/manual/mod/mod_isapi.xml @@ -51,9 +51,9 @@ it to them with their file extensions. To enable any .dll file to be processed as an ISAPI extension, edit the httpd.conf file and add the following line:

    - + AddHandler isapi-handler .dll - + In older versions of the Apache server, isapi-isa was the proper handler name, rather than @@ -66,9 +66,9 @@ requested module loaded. However, you may preload and keep a specific module loaded by using the following syntax in your httpd.conf:

    - + ISAPICacheFile c:/WebWork/Scripts/ISAPI/mytest.dll - +

    Whether or not you have preloaded an ISAPI extension, all ISAPI extensions are governed by the same permissions and -- 2.40.0