summaryrefslogtreecommitdiffstats
path: root/modules/ldap
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2011-03-13 17:45:06 +0100
committerEric Covener <covener@apache.org>2011-03-13 17:45:06 +0100
commit05e818b8b2f1e1ca6ca199d9adb4b91793a15657 (patch)
treeef93a28e6fa23afbeb1a2501e8d0024d412fc9b8 /modules/ldap
parentxforms (diff)
downloadapache2-05e818b8b2f1e1ca6ca199d9adb4b91793a15657.tar.xz
apache2-05e818b8b2f1e1ca6ca199d9adb4b91793a15657.zip
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
Diffstat (limited to 'modules/ldap')
-rw-r--r--modules/ldap/util_ldap.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 7c55bc5b5e..dc8291b97c 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;
}