You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2009/09/16 22:15:50 UTC
svn commit: r815948 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/ldap/util_ldap.c
Author: minfrin
Date: Wed Sep 16 20:15:49 2009
New Revision: 815948
URL: http://svn.apache.org/viewvc?rev=815948&view=rev
Log:
Backport:
Bring the LDAPCacheEntries and LDAPOpCacheEntries usage() in synch with
the manual and the implementation (0 and -1 both disable the cache).
Submitted by: Eric Covener
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=815948&r1=815947&r2=815948&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Sep 16 20:15:49 2009
@@ -9,6 +9,10 @@
mod_proxy_ftp: NULL pointer dereference on error paths.
[Stefan Fritsch <sf fritsch.de>, Joe Orton]
+ *) mod_ldap: Bring the LDAPCacheEntries and LDAPOpCacheEntries
+ usage() in synch with the manual and the implementation (0 and -1
+ both disable the cache). [Eric Covener]
+
*) mod_ssl: The error message when SSLCertificateFile is missing should
at least give the name or position of the problematic virtual host
definition. [Stefan Fritsch sf sfritsch.de]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=815948&r1=815947&r2=815948&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Sep 16 20:15:49 2009
@@ -94,13 +94,6 @@
+1: covener, poirier
+1: minfrin (with r814779 for compiler warning fix)
- * mod_ldap: hints in usage for LDAPCacheEntries and LDAPOpCacheEntries
- updated to match manual and code (0 or -1 to disable)
- PR 40948
- Trunk Patch: http://svn.apache.org/viewvc?rev=814441&view=rev
- 2.2.x patch: Trunk works.
- +1: covener, rpluem, minfrin
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c?rev=815948&r1=815947&r2=815948&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c Wed Sep 16 20:15:49 2009
@@ -2075,9 +2075,9 @@
AP_INIT_TAKE1("LDAPCacheEntries", util_ldap_set_cache_entries,
NULL, RSRC_CONF,
"Set the maximum number of entries that are possible in the "
- "LDAP search cache. Use 0 for no limit. "
- "-1 disables the cache. (default: 1024)"),
-
+ "LDAP search cache. Use 0 or -1 to disable the search cache "
+ "(default: 1024)"),
+
AP_INIT_TAKE1("LDAPCacheTTL", util_ldap_set_cache_ttl,
NULL, RSRC_CONF,
"Set the maximum time (in seconds) that an item can be "
@@ -2087,8 +2087,8 @@
AP_INIT_TAKE1("LDAPOpCacheEntries", util_ldap_set_opcache_entries,
NULL, RSRC_CONF,
"Set the maximum number of entries that are possible "
- "in the LDAP compare cache. Use 0 for no limit. "
- "Use -1 to disable the cache. (default: 1024)"),
+ "in the LDAP compare cache. Use 0 or -1 to disable the compare cache "
+ "(default: 1024)"),
AP_INIT_TAKE1("LDAPOpCacheTTL", util_ldap_set_opcache_ttl,
NULL, RSRC_CONF,