diff options
| author | Eric Covener <covener@apache.org> | 2014-07-05 02:06:15 +0200 |
|---|---|---|
| committer | Eric Covener <covener@apache.org> | 2014-07-05 02:06:15 +0200 |
| commit | 2eaa646655f8f3f4b51d352b007670aff983bb63 (patch) | |
| tree | 11ea20f949b2b9aae46df29272465f67aa349877 /include | |
| parent | Follow-up to r1606368: HANDLE is PVOID which is void * (fix format string) (diff) | |
| download | apache2-2eaa646655f8f3f4b51d352b007670aff983bb63.tar.xz apache2-2eaa646655f8f3f4b51d352b007670aff983bb63.zip | |
make LDAPConnectionPoolTTL more conservative, use r->request_time rather than
end-of-request time, and only update it after a round-trip with the LDAP
server rather than every time we check back into the pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1607960 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 3 | ||||
| -rw-r--r-- | include/util_ldap.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index c01fb3461f..eea914c853 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -463,6 +463,7 @@ ap_mpm_register_socket_callback_timeout. * 20140611.1 (2.5.0-dev) Add ap_proxy_connect_uds(). * 20140627.0 (2.5.0-dev) Revert 20140611.0 change. + * 20140627.1 (2.5.0-dev) add last_backend_conn to util_ldap_connection_t */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ @@ -470,7 +471,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20140627 #endif -#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a diff --git a/include/util_ldap.h b/include/util_ldap.h index 1dc0ee2bd1..aa79fc3065 100644 --- a/include/util_ldap.h +++ b/include/util_ldap.h @@ -135,6 +135,7 @@ typedef struct util_ldap_connection_t { apr_pool_t *rebind_pool; /* frequently cleared pool for rebind data */ int must_rebind; /* The connection was last bound with other then binddn/bindpw */ request_rec *r; /* request_rec used to find this util_ldap_connection_t */ + apr_time_t last_backend_conn; /* the approximate time of the last backend LDAP requst */ } util_ldap_connection_t; typedef struct util_ldap_config_t { |