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 7c55bc5b5e3832398392d9ebb840c20cddd6986e..dc8291b97c8fd41584be5797324ade9a77bcd128 100644 (file)
--- 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;
 }