You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2011/01/05 13:44:34 UTC
svn commit: r1055447 - in /httpd/httpd/trunk: CHANGES
docs/manual/mod/mod_authn_dbd.xml docs/manual/mod/mod_authn_socache.xml
modules/aaa/mod_authn_socache.c
Author: niq
Date: Wed Jan 5 12:44:33 2011
New Revision: 1055447
URL: http://svn.apache.org/viewvc?rev=1055447&view=rev
Log:
Change AuthnCacheProvider --> AuthnCacheProvideFor to deal with overloading
of "provider" and likely confusion with AuthnCacheSOCache.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.xml
httpd/httpd/trunk/docs/manual/mod/mod_authn_socache.xml
httpd/httpd/trunk/modules/aaa/mod_authn_socache.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1055447&r1=1055446&r2=1055447&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Jan 5 12:44:33 2011
@@ -2,6 +2,13 @@
Changes with Apache 2.3.11
+ *) mod_authn_socache: change directive name from AuthnCacheProvider
+ to AuthnCacheProvideFor. The term "provider" is overloaded in
+ this module, and we should avoid confusion between the provider
+ of a backend (AuthnCacheSOCache) and the authn provider(s) for
+ which this module provides cacheing (AuthnCacheProvideFor).
+ [Nick Kew]
+
*) mod_proxy_http: Allocate the fake backend request from a child pool
of the backend connection, instead of misusing the pool of the frontend
request. Fixes a thread safety issue where buckets set aside in the
Modified: httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.xml?rev=1055447&r1=1055446&r2=1055447&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.xml Wed Jan 5 12:44:33 2011
@@ -93,7 +93,7 @@ DBDExptime 300
AuthBasicProvider socache dbd
# Also required for caching: tell the cache to cache dbd lookups!
- AuthnCacheProvider dbd
+ AuthnCacheProvideFor dbd
AuthnCacheContext my-server
# mod_authz_core configuration
Modified: httpd/httpd/trunk/docs/manual/mod/mod_authn_socache.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authn_socache.xml?rev=1055447&r1=1055446&r2=1055447&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authn_socache.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authn_socache.xml Wed Jan 5 12:44:33 2011
@@ -60,7 +60,7 @@ the load on backends</description>
<module>mod_authn_dbd</module> will usually benefit from this cache.</p>
<p>The basic rules to cache for a provider are:</p>
<ol><li>Include the provider you're cacheing for in an
- <directive>AuthnCacheProvider</directive> directive.</li>
+ <directive>AuthnCacheProvideFor</directive> directive.</li>
<li>List <var>socache</var> ahead of the provider you're
cacheing for in your <directive module="mod_auth_basic"
>AuthBasicProvider</directive> or <directive module=
@@ -74,7 +74,7 @@ the load on backends</description>
AuthName "Cached Authentication Example"
AuthBasicProvider socache dbd
AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
- AuthnCacheProvider dbd
+ AuthnCacheProvideFor dbd
AuthnCacheContext dbd-authn-example
AuthnCacheSOCache dbm
Require valid-user
@@ -110,9 +110,9 @@ the load on backends</description>
</directivesynopsis>
<directivesynopsis>
-<name>AuthnCacheProvider</name>
+<name>AuthnCacheProvideFor</name>
<description>Specify which authn provider(s) to cache for</description>
-<syntax>AuthnCacheProvider <var>authn-provider</var> [...]</syntax>
+<syntax>AuthnCacheProvideFor <var>authn-provider</var> [...]</syntax>
<default>None</default>
<contextlist><context>directory</context><context>.htaccess</context></contextlist>
<override>AuthConfig</override>
@@ -120,13 +120,13 @@ the load on backends</description>
<usage>
<p>This directive specifies an authentication provider or providers
to cache for. Credentials found by a provider not listed in an
- AuthnCacheProvider directive will not be cached.</p>
+ AuthnCacheProvideFor directive will not be cached.</p>
<p>For example, to cache credentials found by <module>mod_authn_dbd</module>
or by a custom provider <var>myprovider</var>, but leave those looked
up by lightweight providers like file or dbm lookup alone:</p>
<example>
- AuthnCacheProvider dbd myprovider
+ AuthnCacheProvideFor dbd myprovider
</example>
</usage>
</directivesynopsis>
Modified: httpd/httpd/trunk/modules/aaa/mod_authn_socache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_socache.c?rev=1055447&r1=1055446&r2=1055447&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_socache.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_socache.c Wed Jan 5 12:44:33 2011
@@ -205,7 +205,7 @@ static const command_rec authn_cache_cmd
AP_INIT_TAKE1("AuthnCacheSOCache", authn_cache_socache, NULL, RSRC_CONF,
"socache provider for authn cache"),
/* per-dir stuff */
- AP_INIT_ITERATE("AuthnCacheProvider", authn_cache_setprovider, NULL,
+ AP_INIT_ITERATE("AuthnCacheProvideFor", authn_cache_setprovider, NULL,
OR_AUTHCFG, "Determine what authn providers to cache for"),
AP_INIT_TAKE1("AuthnCacheTimeout", authn_cache_timeout, NULL,
OR_AUTHCFG, "Timeout (secs) for cached credentials"),