From: Daniel Gruno Date: Fri, 4 May 2012 15:07:48 +0000 (+0000) Subject: Backporting syntax highlighting for mod_i|l|m|n*.xml X-Git-Tag: 2.4.3~482 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=182688c7497d8fdc73353cda788a24d49e35fd9f;p=apache Backporting syntax highlighting for mod_i|l|m|n*.xml git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1334018 13f79535-47bb-0310-9956-ffa450edef68 --- 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 diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml index db8c3692fe..d2cfa54081 100644 --- a/docs/manual/mod/mod_ldap.xml +++ b/docs/manual/mod/mod_ldap.xml @@ -60,34 +60,32 @@ by other LDAP modules mod_ldap to increase the performance of HTTP Basic authentication provided by mod_authnz_ldap.

- - # Enable the LDAP connection pool and shared
- # memory cache. Enable the LDAP cache status
- # handler. Requires that mod_ldap and mod_authnz_ldap
- # be loaded. Change the "yourdomain.example.com" to
- # match your domain.
-
- LDAPSharedCacheSize 500000
- LDAPCacheEntries 1024
- LDAPCacheTTL 600
- LDAPOpCacheEntries 1024
- LDAPOpCacheTTL 600
-
- <Location /ldap-status>
- - SetHandler ldap-status
- - Require host yourdomain.example.com
- - Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one
- Require valid-user
- - </Location> - + +# Enable the LDAP connection pool and shared +# memory cache. Enable the LDAP cache status +# handler. Requires that mod_ldap and mod_authnz_ldap +# be loaded. Change the "yourdomain.example.com" to +# match your domain. + +LDAPSharedCacheSize 500000 +LDAPCacheEntries 1024 +LDAPCacheTTL 600 +LDAPOpCacheEntries 1024 +LDAPOpCacheTTL 600 + +<Location /ldap-status> + SetHandler ldap-status + + Require host yourdomain.example.com + + Satisfy any + AuthType Basic + AuthName "LDAP Protected" + AuthBasicProvider ldap + AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one + Require valid-user +</Location> +
LDAP Connection Pool @@ -183,13 +181,11 @@ by other LDAP modules following directives could be used to access the mod_ldap cache information:

- - <Location /server/cache-info>
- - SetHandler ldap-status
- - </Location> - + +<Location /server/cache-info> + SetHandler ldap-status +</Location> +

By fetching the URL http://servername/cache-info, the administrator can get a status report of every cache that is used @@ -211,51 +207,47 @@ by other LDAP modules optional client certificates to be used, as well as the type of encryption to be used on the connection (none, SSL or TLS/STARTTLS).

- - # Establish an SSL LDAP connection on port 636. Requires that
- # mod_ldap and mod_authnz_ldap be loaded. Change the
- # "yourdomain.example.com" to match your domain.
-
- LDAPTrustedGlobalCert CA_DER /certs/certfile.der
-
- <Location /ldap-status>
- - SetHandler ldap-status
- - Require host yourdomain.example.com
- - Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
- Require valid-user
- - </Location> - - - - # Establish a TLS LDAP connection on port 389. Requires that
- # mod_ldap and mod_authnz_ldap be loaded. Change the
- # "yourdomain.example.com" to match your domain.
-
- LDAPTrustedGlobalCert CA_DER /certs/certfile.der
-
- <Location /ldap-status>
- - SetHandler ldap-status
- - Require host yourdomain.example.com
- - Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one TLS
- Require valid-user
- - </Location> - + +# Establish an SSL LDAP connection on port 636. Requires that +# mod_ldap and mod_authnz_ldap be loaded. Change the +# "yourdomain.example.com" to match your domain. + +LDAPTrustedGlobalCert CA_DER /certs/certfile.der + +<Location /ldap-status> + SetHandler ldap-status + + Require host yourdomain.example.com + + Satisfy any + AuthType Basic + AuthName "LDAP Protected" + AuthBasicProvider ldap + AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one + Require valid-user +</Location> + + + +# Establish a TLS LDAP connection on port 389. Requires that +# mod_ldap and mod_authnz_ldap be loaded. Change the +# "yourdomain.example.com" to match your domain. + +LDAPTrustedGlobalCert CA_DER /certs/certfile.der + +<Location /ldap-status> + SetHandler ldap-status + + Require host yourdomain.example.com + + Satisfy any + AuthType Basic + AuthName "LDAP Protected" + AuthBasicProvider ldap + AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one TLS + Require valid-user +</Location> +
@@ -288,29 +280,27 @@ by other LDAP modules an error when an attempt is made to contact the LDAP server at runtime.

- - # Specify a Netscape CA certificate file
- LDAPTrustedGlobalCert CA_CERT7_DB /certs/cert7.db
- # Specify an optional key3.db file for client certificate support
- LDAPTrustedGlobalCert CERT_KEY3_DB /certs/key3.db
- # Specify the secmod file if required
- LDAPTrustedGlobalCert CA_SECMOD /certs/secmod
- <Location /ldap-status>
- - SetHandler ldap-status
- - Require host yourdomain.example.com
- - Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- LDAPTrustedClientCert CERT_NICKNAME <nickname> [password]
- AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
- Require valid-user
- - </Location> - + +# Specify a Netscape CA certificate file +LDAPTrustedGlobalCert CA_CERT7_DB /certs/cert7.db +# Specify an optional key3.db file for client certificate support +LDAPTrustedGlobalCert CERT_KEY3_DB /certs/key3.db +# Specify the secmod file if required +LDAPTrustedGlobalCert CA_SECMOD /certs/secmod +<Location /ldap-status> + SetHandler ldap-status + + Require host yourdomain.example.com + + Satisfy any + AuthType Basic + AuthName "LDAP Protected" + AuthBasicProvider ldap + LDAPTrustedClientCert CERT_NICKNAME <nickname> [password] + AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one + Require valid-user +</Location> + @@ -330,16 +320,16 @@ by other LDAP modules LDAPTrustedMode parameter. If an ldaps:// URL is specified, SSL mode is forced, override this directive.

- - # Specify two CA certificate files
- LDAPTrustedGlobalCert CA_DER /certs/cacert1.der
- LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem
- # Specify a client certificate file and key
- LDAPTrustedGlobalCert CERT_BASE64 /certs/cert1.pem
- LDAPTrustedGlobalCert KEY_BASE64 /certs/key1.pem [password]
- # Do not use this directive, as it will throw an error
- #LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem
- + +# Specify two CA certificate files +LDAPTrustedGlobalCert CA_DER /certs/cacert1.der +LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem +# Specify a client certificate file and key +LDAPTrustedGlobalCert CERT_BASE64 /certs/cert1.pem +LDAPTrustedGlobalCert KEY_BASE64 /certs/key1.pem [password] +# Do not use this directive, as it will throw an error +#LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem + @@ -362,30 +352,28 @@ by other LDAP modules (ldaps://) support has been deprecated to be replaced with TLS, although the SSL functionality still works.

- - # Specify two CA certificate files
- LDAPTrustedGlobalCert CA_DER /certs/cacert1.der
- LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem
- <Location /ldap-status>
- - SetHandler ldap-status
- - Require host yourdomain.example.com
- - LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem
- LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem
- # CA certs respecified due to per-directory client certs
- LDAPTrustedClientCert CA_DER /certs/cacert1.der
- LDAPTrustedClientCert CA_BASE64 /certs/cacert2.pem
- Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
- Require valid-user
- - </Location> - + +# Specify two CA certificate files +LDAPTrustedGlobalCert CA_DER /certs/cacert1.der +LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem +<Location /ldap-status> + SetHandler ldap-status + + Require host yourdomain.example.com + + LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem + LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem + # CA certs respecified due to per-directory client certs + LDAPTrustedClientCert CA_DER /certs/cacert1.der + LDAPTrustedClientCert CA_BASE64 /certs/cacert2.pem + Satisfy any + AuthType Basic + AuthName "LDAP Protected" + AuthBasicProvider ldap + AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one + Require valid-user +</Location> + diff --git a/docs/manual/mod/mod_log_config.xml b/docs/manual/mod/mod_log_config.xml index bcd66fa548..d2f1fc71dc 100644 --- a/docs/manual/mod/mod_log_config.xml +++ b/docs/manual/mod/mod_log_config.xml @@ -445,14 +445,14 @@ expr=expression]

For example, the following two sets of directives have exactly the same effect:

- - # CustomLog with format nickname
- LogFormat "%h %l %u %t \"%r\" %>s %b" common
- CustomLog logs/access_log common
-
- # CustomLog with explicit format string
- CustomLog logs/access_log "%h %l %u %t \"%r\" %>s %b" - + +# CustomLog with format nickname +LogFormat "%h %l %u %t \"%r\" %>s %b" common +CustomLog logs/access_log common + +# CustomLog with explicit format string +CustomLog logs/access_log "%h %l %u %t \"%r\" %>s %b" +

The third argument is optional and controls whether or not to log a particular request. The condition can be the @@ -470,19 +470,19 @@ expr=expression] images on your server in a separate logfile but not in your main log, you can use:

- - SetEnvIf Request_URI \.gif$ gif-image
- CustomLog gif-requests.log common env=gif-image
- CustomLog nongif-requests.log common env=!gif-image - + +SetEnvIf Request_URI \.gif$ gif-image +CustomLog gif-requests.log common env=gif-image +CustomLog nongif-requests.log common env=!gif-image +

Or, to reproduce the behavior of the old RefererIgnore directive, you might use the following:

- - SetEnvIf Referer example\.com localreferer
- CustomLog referer.log referer env=!localreferer - + +SetEnvIf Referer example\.com localreferer +CustomLog referer.log referer env=!localreferer + @@ -526,8 +526,11 @@ expr=expression] percent signs (%).

Example + LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common + + @@ -549,8 +552,10 @@ expr=expression] other format has been specified.

Example - LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
- TransferLog logs/access_log + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" +TransferLog logs/access_log + diff --git a/docs/manual/mod/mod_log_debug.xml b/docs/manual/mod/mod_log_debug.xml index 316346d90f..1556b664ed 100644 --- a/docs/manual/mod/mod_log_debug.xml +++ b/docs/manual/mod/mod_log_debug.xml @@ -35,20 +35,20 @@
  • Log message after request to /foo/* is processed: - - <Location /foo/>
    -   LogMessage "/foo/ has been requested"
    - </Location>
    -     + +<Location /foo/> +  LogMessage "/foo/ has been requested" +</Location> +
  • Log message if request to /foo/* is processed in a sub-request: - - <Location /foo/>
    -   LogMessage "subrequest to /foo/" hook=type_checker expr=%{IS_SUBREQ}
    - </Location>
    -     + +<Location /foo/> +  LogMessage "subrequest to /foo/" hook=type_checker expr=%{IS_SUBREQ} +</Location> + The default log_transaction hook is not executed for sub-requests, therefore we have to use a different hook. @@ -57,21 +57,20 @@
  • Log message if an IPv6 client causes a request timeout: - - LogMessage "IPv6 timeout from %{REMOTE_ADDR}" - "expr=-T %{IPV6} && %{REQUEST_STATUS} = 408" - + + LogMessage "IPv6 timeout from %{REMOTE_ADDR}" "expr=-T %{IPV6} && %{REQUEST_STATUS} = 408" + Note the placing of the double quotes for the expr= argument.
  • Log the value of the "X-Foo" request environment variable in each stage of the request: - - <Location />
    -   LogMessage "%{reqenv:X-Foo}" hook=all
    - </Location>
    -     + +<Location /> +  LogMessage "%{reqenv:X-Foo}" hook=all +</Location> + Together with microsecond time stamps in the error log, hook=all also allows to determine the times spent in the different parts of the request processing. diff --git a/docs/manual/mod/mod_lua.xml b/docs/manual/mod/mod_lua.xml index 0c51337d8d..043c99a606 100644 --- a/docs/manual/mod/mod_lua.xml +++ b/docs/manual/mod/mod_lua.xml @@ -53,17 +53,17 @@ Be sure to check the CHANGES file before upgrading.

    The basic module loading directive is

    - + LoadModule lua_module modules/mod_lua.so - +

    mod_lua provides a handler named lua-script, which can be used with an AddHandler directive:

    - + AddHandler lua-script .lua - +

    This will cause mod_lua to handle requests for files @@ -86,7 +86,9 @@ and mod_status.

    just evaluating a script body CGI style. A handler function looks something like this:

    -example.lua
    +
+
+example.lua
 -- example handler
 
 require "string"
@@ -112,7 +114,7 @@ function handle(r)
         r:puts("unknown HTTP method " .. r.method)
     end
 end
-
     +

    This handler function just prints out the uri or form encoded @@ -140,7 +142,8 @@ they'll return OK, DONE, or DECLINED, which you can write in lua as apache2.OK, apache2.DONE, or apache2.DECLINED, or else an HTTP status code.

    -translate_name.lua
    +
+translate_name.lua
 -- example hook that rewrites the URI to a filesystem path.
 
 require 'apache2'
@@ -153,9 +156,10 @@ function translate_name(r)
     -- we don't care about this URL, give another module a chance
     return apache2.DECLINED
 end
-
     + -translate_name2.lua
    +
+translate_name2.lua
 --[[ example hook that rewrites one URI to another URI. It returns a
      apache2.DECLINED to give other URL mappers a chance to work on the
      substitution, including the core translate_name hook which maps based
@@ -174,7 +178,7 @@ function translate_name(r)
     end
     return apache2.DECLINED
 end
-
     +
    Data Structures @@ -328,27 +332,25 @@ end

    The request_rec has (at least) the following methods:

    - + r:addoutputfilter(name|function) -- add an output filter - + - - r:parseargs() -- returns a lua table containing the request's - query string arguments - + + r:parseargs() -- returns a lua table containing the request's query string arguments + - - r:parsebody() -- parse the request body as a POST and return - a lua table - + + r:parsebody() -- parse the request body as a POST and return a lua table + - + r:puts("hello", " world", "!") -- print to response body - + - + r:write("a single string") -- print to response body - + @@ -356,7 +358,7 @@ end
    Logging Functions - + -- examples of logging messages
    r:trace1("This is a trace log message") -- trace1 through trace8 can be used
    r:debug("This is a debug log message")
    @@ -367,7 +369,7 @@ end r:alert("This is an alert log message")
    r:crit("This is an crit log message")
    r:emerg("This is an emerg log message")
    -     +
    @@ -458,16 +460,18 @@ end be careful writing your regular expressions to avoid security issues.

    Examples: - LuaMapHandler /(\w+)/(/w+) /scripts/$1.lua handle_$2 + + LuaMapHandler /(\w+)/(\w+) /scripts/$1.lua handle_$2 +

    This would match uri's such as /photos/show?id=9 to the file /scripts/photos.lua and invoke the handler function handle_show on the lua vm after loading that file.

    - + LuaMapHandler /bingo /scripts/wombat.lua - +

    This would invoke the "handle" function, which is the default if no specific function name is provided.

    @@ -487,8 +491,10 @@ end lua vms.

    Examples: - LuaPackagePath /scripts/lib/?.lua
    - LuaPackagePath /scripts/lib/?/init.lua + +LuaPackagePath /scripts/lib/?.lua +LuaPackagePath /scripts/lib/?/init.lua +     @@ -533,9 +539,11 @@ end for development.

    Examples: - LuaCodeCache stat
    - LuaCodeCache forever
    - LuaCodeCache never
    + +LuaCodeCache stat +LuaCodeCache forever +LuaCodeCache never +     @@ -567,10 +575,12 @@ end

    Example:

    -
    +
 # httpd.conf
 LuaHookTranslateName /scripts/conf/hooks.lua silly_mapper
+
 
+
 -- /scripts/conf/hooks.lua --
 require "apache2"
 function silly_mapper(r)
@@ -581,7 +591,7 @@ function silly_mapper(r)
         return apache2.DECLINED
     end
 end
-
     + Context

    This directive is not valid in Directory, a request. This can be used to implement arbitrary authentication and authorization checking. A very simple example:

    -
    +
 require 'apache2'
 
 -- fake authcheck hook
@@ -692,7 +702,7 @@ function authcheck_hook(r)
    end
    return apache2.OK
 end
-
     + Ordering

    The optional arguments "early" or "late" control when this script runs relative to other modules.

     diff --git a/docs/manual/mod/mod_mime.xml b/docs/manual/mod/mod_mime.xml index a38bdd46ba..211be9548d 100644 --- a/docs/manual/mod/mod_mime.xml +++ b/docs/manual/mod/mod_mime.xml @@ -143,11 +143,11 @@ module="mod_mime_magic">MimeMagicFile of using AddHandler cgi-script .cgi, use

    Configure handler based on final extension only - <FilesMatch \.cgi$> - - SetHandler cgi-script - - </FilesMatch> + +<FilesMatch \.cgi$> + SetHandler cgi-script +</FilesMatch> +
    @@ -192,7 +192,7 @@ module="mod_mime_magic">MimeMagicFile resource, in order to tell the client browser about the encoding method.

    - Content-encoding: pkzip + Content-encoding: pkzip
    Character sets and languages @@ -232,8 +232,8 @@ module="mod_mime_magic">MimeMagicFile render the information.

    - Content-Language: en, fr
    - Content-Type: text/plain; charset=ISO-8859-1 +Content-Language: en, fr +Content-Type: text/plain; charset=ISO-8859-1

    The language specification is the two-letter abbreviation @@ -263,10 +263,12 @@ charset extension.

    Example - AddLanguage ja .ja
    - AddCharset EUC-JP .euc
    - AddCharset ISO-2022-JP .jis
    - AddCharset SHIFT_JIS .sjis + +AddLanguage ja .ja +AddCharset EUC-JP .euc +AddCharset ISO-2022-JP .jis +AddCharset SHIFT_JIS .sjis +

    Then the document xxxx.ja.jis will be treated @@ -310,8 +312,10 @@ type extension.

    Example - AddEncoding x-gzip .gz
    - AddEncoding x-compress .Z + +AddEncoding x-gzip .gz +AddEncoding x-compress .Z +

    This will cause filenames containing the .gz extension @@ -359,9 +363,9 @@ handler activate CGI scripts with the file extension .cgi, you might use:

    - + AddHandler cgi-script .cgi - +

    Once that has been put into your httpd.conf file, any file containing the .cgi extension will be treated as a CGI program.

    @@ -431,9 +435,11 @@ language extension.

    Example - AddEncoding x-compress .Z
    - AddLanguage en .en
    - AddLanguage fr .fr + +AddEncoding x-compress .Z +AddLanguage en .en +AddLanguage fr .fr +

    Then the document xxxx.en.Z will be treated as @@ -449,11 +455,11 @@ language extension, the last one encountered is the one that is used. That is, for the case of:

    - - AddLanguage en .en
    - AddLanguage en-gb .en
    - AddLanguage en-us .en -     + +AddLanguage en .en +AddLanguage en-gb .en +AddLanguage en-us .en +

    documents with the extension .en would be treated as being en-us.

    @@ -494,9 +500,9 @@ later. .shtml files for server-side includes and will then compress the output using mod_deflate.

    - + AddOutputFilter INCLUDES;DEFLATE shtml - +

    If more than one filter is specified, they must be separated by semicolons in the order in which they should process the @@ -514,34 +520,26 @@ later. the AddOutputFilter directive.

    - - # Effective filter "DEFLATE"
    - AddOutputFilter DEFLATE shtml
    - <Location /foo>
    - - # Effective filter "INCLUDES", replacing "DEFLATE"
    - AddOutputFilter INCLUDES shtml
    -     - </Location>
    - <Location /bar>
    - - # Effective filter "INCLUDES;DEFLATE", replacing "DEFLATE"
    - AddOutputFilter INCLUDES;DEFLATE shtml
    -     - </Location>
    - <Location /bar/baz>
    - - # Effective filter "BUFFER", replacing "INCLUDES;DEFLATE"
    - AddOutputFilter BUFFER shtml
    -     - </Location>
    - <Location /bar/baz/buz>
    - - # No effective filter, replacing "BUFFER"
    - RemoveOutputFilter shtml
    -     - </Location> -     + +# Effective filter "DEFLATE" +AddOutputFilter DEFLATE shtml +<Location /foo> + # Effective filter "INCLUDES", replacing "DEFLATE" + AddOutputFilter INCLUDES shtml +</Location> +<Location /bar> + # Effective filter "INCLUDES;DEFLATE", replacing "DEFLATE" + AddOutputFilter INCLUDES;DEFLATE shtml +</Location> +<Location /bar/baz> + # Effective filter "BUFFER", replacing "INCLUDES;DEFLATE" + AddOutputFilter BUFFER shtml +</Location> +<Location /bar/baz/buz> + # No effective filter, replacing "BUFFER" + RemoveOutputFilter shtml +</Location> + RemoveOutputFilter SetOutputFilter @@ -573,13 +571,17 @@ type Example + AddType image/gif .gif +

    Or, to specify multiple file extensions in one directive:

    Example + AddType image/jpeg jpeg jpg jpe +

    The extension argument is case-insensitive and can @@ -594,7 +596,9 @@ type qs:

    Example - Addtype application/rss+xml;qs=0.8 .xml + + AddType application/rss+xml;qs=0.8 .xml +

    This is useful in situations, e.g. when a client @@ -658,9 +662,9 @@ a matching file with MultiViews and filters to participate in Multviews, but will exclude unknown files:

    - + MultiviewsMatch Handlers Filters - +

    MultiviewsMatch is not allowed in a Location or Content-Language header field will be generated.

    Example + DefaultLanguage en + mod_negotiation @@ -725,7 +731,9 @@ components as part of the filename

    This directive is recommended when you have a virtual filesystem.

    Example + ModMimeUsePathInfo On +

    If you have a request for /index.php/foo.shtml @@ -764,7 +772,9 @@ later. be specified with or without a leading dot.

    Example + RemoveCharset .html .shtml + @@ -787,13 +797,13 @@ extensions server config files. An example of its use might be:

    /foo/.htaccess: - AddEncoding x-gzip .gz
    - AddType text/plain .asc
    - <Files *.gz.asc>
    - - RemoveEncoding .gz
    -     - </Files> + +AddEncoding x-gzip .gz +AddType text/plain .asc +<Files *.gz.asc> + RemoveEncoding .gz +</Files> +

    This will cause foo.gz to be marked as being @@ -830,11 +840,15 @@ extensions config files. An example of its use might be:

    /foo/.htaccess: + AddHandler server-parsed .html + /foo/bar/.htaccess: + RemoveHandler .html +

    This has the effect of returning .html files in @@ -922,7 +936,9 @@ later. be specified with or without a leading dot.

    Example + RemoveOutputFilter shtml + AddOutputFilter @@ -947,7 +963,9 @@ extensions might be:

    /foo/.htaccess: + RemoveType .cgi +

    This will remove any special handling of .cgi diff --git a/docs/manual/mod/mod_mime_magic.xml b/docs/manual/mod/mod_mime_magic.xml index 0c40c38fb0..bd79868a4e 100644 --- a/docs/manual/mod/mod_mime_magic.xml +++ b/docs/manual/mod/mod_mime_magic.xml @@ -264,7 +264,9 @@ using the specified magic file server's file.

    Example + MimeMagicFile conf/magic + diff --git a/docs/manual/mod/mod_negotiation.xml b/docs/manual/mod/mod_negotiation.xml index ef9593b1f5..977e2de175 100644 --- a/docs/manual/mod/mod_negotiation.xml +++ b/docs/manual/mod/mod_negotiation.xml @@ -177,9 +177,9 @@ Negotiation type-map handler with an AddHandler directive:

    - + AddHandler type-map .var - +

    A request for document.html in this directory will result in document.html.var being consulted, and the @@ -257,10 +257,10 @@ found (equally acceptable) then the first matching variant, en, will be served.

    - - LanguagePriority en fr de
    - ForceLanguagePriority Prefer -     + +LanguagePriority en fr de +ForceLanguagePriority Prefer +

    ForceLanguagePriority Fallback uses LanguagePriority to @@ -271,10 +271,10 @@ found variant from the LanguagePriority list below will be served.

    - - LanguagePriority en fr de
    - ForceLanguagePriority Fallback -     + +LanguagePriority en fr de +ForceLanguagePriority Fallback +

    Both options, Prefer and Fallback, may be specified, so either the first matching variant from express a preference, when handling a Multiviews request. The list of MIME-lang are in order of decreasing preference.

    - Example: + LanguagePriority en fr de - +

    For a request for foo.html, where foo.html.fr and foo.html.de both