From: Eric Covener <covener@apache.org>
Date: Sun, 13 Mar 2011 16:45:06 +0000 (+0000)
Subject: change all the negative values for LDAPConnPoolTTL into
X-Git-Tag: 2.3.12~239
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05e818b8b2f1e1ca6ca199d9adb4b91793a15657;p=thirdparty%2Fapache%2Fhttpd.git

change all the negative values for LDAPConnPoolTTL into
-2 (AP_LDAP_CONNPOOL_INFINITE), so we can't get confused
over -1 (AP_LDAP_CONNPOOL_DEFAULT) being merged.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1081146 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 7c55bc5b5e3..dc8291b97c8 100644
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -2586,6 +2586,10 @@ static const char *util_ldap_set_conn_ttl(cmd_parms *cmd,
         return "LDAPConnPoolTTL has wrong format";
     }
 
+    if (timeout < 0) { 
+        /* reserve -1 for default value */
+        timeout =  AP_LDAP_CONNPOOL_INFINITE;
+    }
     st->connectionPoolTTL = timeout;
     return NULL;
 }