Return-Path:
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 35808 invoked from network); 17 Nov 2005 21:41:16 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
by minotaur.apache.org with SMTP; 17 Nov 2005 21:41:16 -0000
Received: (qmail 14229 invoked by uid 500); 17 Nov 2005 21:41:15 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 14161 invoked by uid 500); 17 Nov 2005 21:41:14 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help:
list-unsubscribe:
List-Post:
List-Id:
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 14150 invoked by uid 99); 17 Nov 2005 21:41:14 -0000
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
by apache.org (qpsmtpd/0.29) with SMTP; Thu, 17 Nov 2005 13:41:14 -0800
Received: (qmail 35461 invoked by uid 65534); 17 Nov 2005 21:40:54 -0000
Message-ID: <20051117214054.35460.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r345333 - in /httpd/httpd/branches/2.2.x/docs/manual:
filter.xml
mod/core.xml
Date: Thu, 17 Nov 2005 21:40:53 -0000
To: cvs@httpd.apache.org
From: slive@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N
Author: slive
Date: Thu Nov 17 13:40:51 2005
New Revision: 345333
URL: http://svn.apache.org/viewcvs?rev=345333&view=rev
Log:
Merge r345298, r345301, r345302 from trunk:
A few markup and spelling fixes.
* Deprecate AddOutputFilterByType
* Link up Require and AuthType to the relevant aaa modules.
Remove redundant link.
Modified:
httpd/httpd/branches/2.2.x/docs/manual/filter.xml
httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
Modified: httpd/httpd/branches/2.2.x/docs/manual/filter.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/filter.xml?rev=345333&r1=345332&r2=345333&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/filter.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/filter.xml Thu Nov 17 13:40:51 2005
@@ -67,17 +67,20 @@
Some examples of filtering in the standard Apache distribution are:
-- mod_includes, implements server-side includes.
-- mod_ssl, implements SSL encryption (https).
-- mod_deflate, implements compression/decompression on the fly.
-- mod_charset_lite, transcodes between different character sets.
-- mod_ext_filter, runs an external program as a filter.
+- mod_include, implements server-side includes.
+- mod_ssl, implements SSL encryption (https).
+- mod_deflate, implements compression/decompression on the fly.
+- mod_charset_lite, transcodes between different character sets.
+- mod_ext_filter, runs an external program as a filter.
-Apache also uses a number of filters internally, to perform
+
Apache also uses a number of filters internally to perform
functions like chunking and byte-range handling.
-A wider range of applications are implemented by third-party
-filter modules. A few of these are:
+A wider range of applications are implemented by third-party filter
+modules available from modules.apache.org and
+elsewhere. A few of these are:
+
- HTML and XML processing and rewriting
- XSLT transforms and XIncludes
@@ -88,6 +91,7 @@
- Text search-and-replace editing
+
Smart Filtering
@@ -108,7 +112,7 @@
an HTML processing filter will only run if the content is
text/html or application/xhtml+xml
A compression filter will only run if the input is a
-compressable type and not already compressed
+compressible type and not already compressed
A charset conversion filter will be inserted if a text
document is not already in the desired charset
@@ -117,11 +121,11 @@
Using Filters
There are two ways to use filtering: Simple and Dynamic.
-In general, you should use one or the other: mixing them can
+In general, you should use one or the other; mixing them can
have unexpected consequences (although simple Input filtering
-can be mixed freely with either simple or dynamic Output filtering!
+can be mixed freely with either simple or dynamic Output filtering).
The Simple Way is the only way to configure input filters, and is
-suficient for output filters where you need a static filter chain.
+sufficient for output filters where you need a static filter chain.
Relevant directives are
SetInputFilter,
SetOutputFilter,
@@ -134,10 +138,13 @@
of output filters, as discussed in the mod_filter page.
Relevant directives are
FilterChain,
- FilterDeclare,
+ FilterDeclare, and
FilterProvider.
-One further directive AddOutputFilterByType is still supported,
-but may be problematic and is now deprecated. Use dynamic configuration
-instead.
+
+One further directive AddOutputFilterByType is still supported,
+but may be problematic and is now deprecated. Use dynamic
+configuration instead.
+
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml?rev=345333&r1=345332&r2=345333&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml Thu Nov 17 13:40:51 2005
@@ -242,12 +242,14 @@
virtual hostdirectory
.htaccess
FileInfo
-Available in Apache 2.0.33 and later
+Available in Apache 2.0.33 and later; deprecated in Apache 2.1 and later
This directive activates a particular output filter for a request depending on the
- response MIME-type.
+ response MIME-type. Because of certain
+ problems discussed below, this directive is deprecated. The same
+ functionality is available using mod_filter.
The following example uses the DEFLATE
filter, which
is provided by mod_deflate. It will compress all
@@ -513,18 +515,21 @@
This directive selects the type of user authentication for a
- directory. Only Basic
and Digest
are
- currently implemented.
+ directory. The authentication types available are
+ Basic
(implemented by
+ mod_auth_basic) and Digest
+ (implemented by mod_auth_digest).
+
+ To implement authentication, you must also use the AuthName and Require directives. In addition, the
+ server must have an authentication-provider module such as
+ mod_authn_file and an authorization module such
+ as mod_authz_user.
+
- It must be accompanied by AuthName and Require directives, and directives such
- as AuthUserFile and
- AuthGroupFile to
- work.
-
Authentication, Authorization,
-and Access Control
+ and Access Control
@@ -2386,8 +2391,11 @@
AuthConfig
- This directive selects which authenticated users can access
- a resource. The allowed syntaxes are:
+ This directive selects which authenticated users can access a
+ resource. The restrictions are processed by authorization
+ modules. Some of the allowed syntaxes provided by
+ mod_authz_owner and
+ mod_authz_groupfile are:
Require user userid [userid]
@@ -2402,6 +2410,11 @@
- All valid users can access the resource.
+ Other authorization modules that implement require options
+ include mod_authnz_ldap,
+ mod_authz_dbm, and
+ mod_authz_owner.
+
Require must be accompanied by
AuthName and AuthType directives, and directives such
@@ -2425,6 +2438,9 @@
Limit
section.
+
+Authentication, Authorization,
+ and Access Control
Satisfy
mod_authz_host