From: Nick Kew Date: Wed, 26 Oct 2005 10:07:51 +0000 (+0000) Subject: Backport documentation updates from trunk X-Git-Tag: 2.1.9~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfe6e4fba741fd3e836fe1686397676edafef3e7;p=thirdparty%2Fapache%2Fhttpd.git Backport documentation updates from trunk git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@328618 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_dbd.html.en b/docs/manual/mod/mod_dbd.html.en index ece4261f4ed..4505c027901 100644 --- a/docs/manual/mod/mod_dbd.html.en +++ b/docs/manual/mod/mod_dbd.html.en @@ -24,7 +24,7 @@

Available Languages:  en 

- +
Description:Manages SQL database connections
Status:Experimental
Status:Extension
Module Identifier:dbd_module
Source File:mod_dbd.c
Compatibility:Version 2.1 and higher
@@ -123,7 +123,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c Description:Keepalive time for idle connections Syntax:DBDExptime time-in-seconds Context:server config, virtual host -Status:Experimental +Status:Extension Module:mod_dbd

Set the time to keep idle connections alive where the number @@ -137,7 +137,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c Description:Maximum sustainednumber of connections Syntax:DBDKeep number Context:server config, virtual host -Status:Experimental +Status:Extension Module:mod_dbd

Set the maximum number of connections per process to be @@ -151,7 +151,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c Description:Maximum number of connections Syntax:DBDMax number Context:server config, virtual host -Status:Experimental +Status:Extension Module:mod_dbd

Set the hard maximum number of connections per process @@ -164,7 +164,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c Description:Minimum number of connections Syntax:DBDMin number Context:server config, virtual host -Status:Experimental +Status:Extension Module:mod_dbd

Set the minimum number of connections per process (threaded @@ -178,7 +178,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c Syntax:DBDParams param1=value1[,param2=value2] Context:server config, virtual host -Status:Experimental +Status:Extension Module:mod_dbd

As required by the underlying driver. Typically this will be @@ -192,7 +192,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c Description:Whether to use persistent connections Syntax:DBDPersist 0|1 Context:server config, virtual host -Status:Experimental +Status:Extension Module:mod_dbd

If set to 0, persistent and pooled connections are disabled. @@ -211,7 +211,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c Description:Define an SQL prepared statement Syntax:DBDPrepareSQL "SQL statement" label Context:server config, virtual host -Status:Experimental +Status:Extension Module:mod_dbd

For modules such as authentication that use repeatedly use a @@ -226,7 +226,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c Description:Specify an SQL driver Syntax:DBDriver name Context:server config, virtual host -Status:Experimental +Status:Extension Module:mod_dbd

Selects an apr_dbd driver by name. The driver must be installed @@ -241,4 +241,4 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c

- \ No newline at end of file + diff --git a/docs/manual/mod/mod_dbd.xml b/docs/manual/mod/mod_dbd.xml index 7f6958cb136..d08a75fa626 100644 --- a/docs/manual/mod/mod_dbd.xml +++ b/docs/manual/mod/mod_dbd.xml @@ -24,7 +24,7 @@ mod_dbd Manages SQL database connections -Experimental +Extension mod_dbd.c dbd_module Version 2.1 and higher diff --git a/docs/manual/mod/mod_filter.html.en b/docs/manual/mod/mod_filter.html.en index 73ac85cd5a5..fb30f25de46 100644 --- a/docs/manual/mod/mod_filter.html.en +++ b/docs/manual/mod/mod_filter.html.en @@ -24,7 +24,7 @@

Available Languages:  en 

- +
Description:Context-sensitive smart filter configuration module
Status:Experimental
Status:Base
Module Identifier:filter_module
Source File:mod_filter.c
Compatibility:Version 2.1 and higher
@@ -233,7 +233,7 @@ Syntax:FilterChain [+=-@!]filter-name ... Context:server config, virtual host, directory, .htaccess Override:Options -Status:Experimental +Status:Base Module:mod_filter

This configures an actual filter chain, from declared filters. @@ -269,7 +269,7 @@ Syntax:FilterDeclare filter-name [type] Context:server config, virtual host, directory, .htaccess Override:Options -Status:Experimental +Status:Base Module:mod_filter

This directive declares an output filter together with a @@ -294,7 +294,7 @@ proto-flags Context:server config, virtual host, directory, .htaccess Override:Options -Status:Experimental +Status:Base Module:mod_filter

This directs mod_filter to deal with ensuring the @@ -343,7 +343,7 @@ [req|resp|env]=dispatch match Context:server config, virtual host, directory, .htaccess Override:Options -Status:Experimental +Status:Base Module:mod_filter

This directive registers a provider for the smart filter. @@ -368,9 +368,9 @@

The match argument specifies a match that will be applied to the filter's dispatch criterion. The match may be - a string match (exact match or substring), a regex, an integer (greater, - lessthan or equals), or unconditional. The first characters of the - match argument determines this:

+ a string match (exact match or substring), a regex, an integer (greater, lessthan or equals), or + unconditional. The first characters of the match argument + determines this:

First, if the first character is an exclamation mark (!), this reverses the rule, so the provider will be used @@ -399,7 +399,7 @@ mod_filter Syntax:FilterTrace filter-name level Context:server config, virtual host, directory -Status:Experimental +Status:Base Module:mod_filter

This directive generates debug information from @@ -432,4 +432,4 @@

- \ No newline at end of file + diff --git a/docs/manual/mod/mod_filter.xml b/docs/manual/mod/mod_filter.xml index d39a3ba5837..4466b06c533 100644 --- a/docs/manual/mod/mod_filter.xml +++ b/docs/manual/mod/mod_filter.xml @@ -24,7 +24,7 @@ mod_filter Context-sensitive smart filter configuration module -Experimental +Base mod_filter.c filter_module Version 2.1 and higher @@ -207,13 +207,21 @@ details of filter implementation, reducing the complexity required of content filter modules. This is work-in-progress; the FilterProtocol implements - some of this functionality, but there are no API calls yet.

+ some of this functionality for back-compatibility with Apache 2.0 + modules. For httpd 2.1 and up, the + ap_register_output_filter_protocol and + ap_filter_protocol API enables filter modules to + declare their own behaviour.

At the same time, mod_filter should not interfere with a filter that wants to handle all aspects of the protocol. By default (i.e. in the absence of any FilterProtocol directives), mod_filter will leave the headers untouched.

+ +

At the time of writing, this feature is largely untested, + as modules in common use are designed to work with 2.0. + Modules using it should test it carefully.

@@ -278,9 +286,9 @@

The match argument specifies a match that will be applied to the filter's dispatch criterion. The match may be a string match (exact match or substring), a regex, an integer (greater, - lessthan or equals), or unconditional. The first characters of the - match argument determines this:

+ >regex, an integer (greater, lessthan or equals), or + unconditional. The first characters of the match argument + determines this:

First, if the first character is an exclamation mark (!), this reverses the rule, so the provider will be used