From: Justin Erenkrantz Date: Sun, 13 Nov 2005 08:04:30 +0000 (+0000) Subject: Merge in 332942. X-Git-Tag: 2.1.10~48 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=358628395b766fbd1cfefd4bc7c203f72cf038ea;p=thirdparty%2Fapache%2Fhttpd.git Merge in 332942. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@332945 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/logs.html.en b/docs/manual/logs.html.en index 3451509becc..85292eb586c 100644 --- a/docs/manual/logs.html.en +++ b/docs/manual/logs.html.en @@ -538,7 +538,26 @@

Other Log Files

-
Related ModulesRelated Directives
+
Related ModulesRelated Directives
+ +

Logging actual bytes sent and recieved

+ + +

mod_logio adds in two additional + LogFormat fields + (%I and %O) that log the actual number of bytes received and sent + on the network.

+ + +

Forensic Logging

+ + +

mod_log_forensic provides for forensic logging of + client requests. Logging is done before and after processing a + request, so the forensic log contains two log lines for each + request. The forensic logger is very strict with no customizations. + It can be an invaluable debugging and security tool.

+

PID File

diff --git a/docs/manual/logs.xml b/docs/manual/logs.xml index 0f865ba9432..715e558e3f2 100644 --- a/docs/manual/logs.xml +++ b/docs/manual/logs.xml @@ -567,10 +567,14 @@ + mod_logio + mod_log_forensic mod_cgi mod_rewrite + LogFormat + ForensicLog PidFile RewriteLog RewriteLogLevel @@ -580,6 +584,25 @@ +
+ Logging actual bytes sent and recieved + +

mod_logio adds in two additional + LogFormat fields + (%I and %O) that log the actual number of bytes received and sent + on the network.

+
+ +
+ Forensic Logging + +

mod_log_forensic provides for forensic logging of + client requests. Logging is done before and after processing a + request, so the forensic log contains two log lines for each + request. The forensic logger is very strict with no customizations. + It can be an invaluable debugging and security tool.

+
+
PID File diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en index 40cb9ba35d0..350493de706 100644 --- a/docs/manual/sections.html.en +++ b/docs/manual/sections.html.en @@ -39,15 +39,16 @@ to change the scope of other configuration directives.

Types of Configuration Section Containers

-
Related ModulesRelated Directives
+
Related ModulesRelated Directives

There are two basic types of containers. Most containers are evaluated for each request. The enclosed directives are applied only -for those requests that match the containers. The <IfDefine> and <IfModule> containers, on the -other hand, are evaluated only at server startup and restart. If -their conditions are true at startup, then the enclosed directives -will apply to all requests. If the conditions are not true, the -enclosed directives will be ignored.

+for those requests that match the containers. The <IfDefine>, <IfModule>, and +<IfVersion> +containers, on the other hand, are evaluated only at server startup +and restart. If their conditions are true at startup, then the +enclosed directives will apply to all requests. If the conditions are +not true, the enclosed directives will be ignored.

The <IfDefine> directive encloses directives that will only be applied if an appropriate @@ -82,8 +83,24 @@ MimeMagicFile conf/magic
</IfModule>

-

Both <IfDefine> -and <IfModule> +

The <IfVersion> +directive is very similar to <IfDefine> and <IfModule>, except it encloses directives that will +only be applied if a particular version of the server is executing. This +module is designed for the use in test suites and large networks which have to +deal with different httpd versions and different configurations.

+ +

+ <IfVersion >= 2.1>
+ + # this happens only in versions greater or
+ # equal 2.1.0.
+ + </IfVersion> +

+ +

<IfDefine>, +<IfModule>, and the +<IfVersion> can apply negative conditions by preceding their test with "!". Also, these sections can be nested to achieve more complex restrictions.

diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml index dbdcc5c4247..6a44fc004fa 100644 --- a/docs/manual/sections.xml +++ b/docs/manual/sections.xml @@ -37,6 +37,7 @@ to change the scope of other configuration directives.

core +mod_version mod_proxy @@ -46,6 +47,7 @@ to change the scope of other configuration directives.

FilesMatch IfDefine IfModule +IfVersion Location LocationMatch Proxy @@ -57,12 +59,13 @@ to change the scope of other configuration directives.

There are two basic types of containers. Most containers are evaluated for each request. The enclosed directives are applied only for those requests that match the containers. The IfDefine and IfModule containers, on the -other hand, are evaluated only at server startup and restart. If -their conditions are true at startup, then the enclosed directives -will apply to all requests. If the conditions are not true, the -enclosed directives will be ignored.

+type="section" module="core">IfDefine, IfModule, and +IfVersion +containers, on the other hand, are evaluated only at server startup +and restart. If their conditions are true at startup, then the +enclosed directives will apply to all requests. If the conditions are +not true, the enclosed directives will be ignored.

The IfDefine directive encloses directives that will only be applied if an appropriate @@ -99,8 +102,26 @@ MimeMagicFile conf/magic
</IfModule> -

Both IfDefine -and IfModule +

The IfVersion +directive is very similar to IfDefine and IfModule, except it encloses directives that will +only be applied if a particular version of the server is executing. This +module is designed for the use in test suites and large networks which have to +deal with different httpd versions and different configurations.

+ + + <IfVersion >= 2.1>
+ + # this happens only in versions greater or
+ # equal 2.1.0.
+ + </IfVersion> + + +

IfDefine, +IfModule, and the +IfVersion can apply negative conditions by preceding their test with "!". Also, these sections can be nested to achieve more complex restrictions.

@@ -495,4 +516,3 @@ Deny from badguy.example.com
-