39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From b2d18fb704c64ce7767e07fe546eecec98c91b50 Mon Sep 17 00:00:00 2001
|
|
From: Eirc Covener <covener@apache.org>
|
|
Date: Fri, 27 Jan 2023 08:58:03 PM GMT+0800
|
|
Subject: [PATCH] mod_ldap: LDAPConnectionPoolTTL should accept negative values in order to
|
|
allow connections of any age to be reused. Up to now, a negative value
|
|
was handled as an error when parsing the configuration file
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/apache/httpd/commit/b2d18fb704c64ce7767e07fe546eecec98c91b50
|
|
|
|
---
|
|
modules/ldap/util_ldap.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
|
|
index 4d92ec9..14b774a 100644
|
|
--- a/modules/ldap/util_ldap.c
|
|
+++ b/modules/ldap/util_ldap.c
|
|
@@ -2752,12 +2752,14 @@ static const char *util_ldap_set_conn_ttl(cmd_parms *cmd,
|
|
void *dummy,
|
|
const char *val)
|
|
{
|
|
- apr_interval_time_t timeout;
|
|
+ apr_interval_time_t timeout = -1;
|
|
util_ldap_state_t *st =
|
|
(util_ldap_state_t *)ap_get_module_config(cmd->server->module_config,
|
|
&ldap_module);
|
|
|
|
- if (ap_timeout_parameter_parse(val, &timeout, "s") != APR_SUCCESS) {
|
|
+ /* Negative values mean AP_LDAP_CONNPOOL_INFINITE */
|
|
+ if (val[0] != '-' &&
|
|
+ ap_timeout_parameter_parse(val, &timeout, "s") != APR_SUCCESS) {
|
|
return "LDAPConnectionPoolTTL has wrong format";
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|