From: Graham Leggett <minfrin@apache.org>
Date: Wed, 16 Sep 2009 20:15:49 +0000 (+0000)
Subject: Backport:
X-Git-Tag: 2.2.14~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01dc4dca846a13cb5c013f2f45b6695f848deed8;p=thirdparty%2Fapache%2Fhttpd.git

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@815948 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 38ac518e4fa..e6c48eae882 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,10 @@ Changes with Apache 2.2.14
      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]
diff --git a/STATUS b/STATUS
index 67dbe7a22d4..85a2694f9d1 100644
--- a/STATUS
+++ b/STATUS
@@ -94,13 +94,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
    +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 ]
 
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index c9cc6e988a6..5b432696f9e 100644
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -2075,9 +2075,9 @@ static const command_rec util_ldap_cmds[] = {
     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 @@ static const command_rec util_ldap_cmds[] = {
     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,