mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
Set the connection timeout for LDAP SDK's that support the option. For SDK's that don't, log a warning message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@149419 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -1605,11 +1605,16 @@ static const char *util_ldap_set_connection_timeout(cmd_parms *cmd, void *dummy,
|
|||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef LDAP_OPT_NETWORK_TIMEOUT
|
||||||
st->connectionTimeout = atol(ttl);
|
st->connectionTimeout = atol(ttl);
|
||||||
|
|
||||||
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, cmd->server,
|
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, cmd->server,
|
||||||
"[%d] ldap connection: Setting connection timeout to %ld seconds.",
|
"[%d] ldap connection: Setting connection timeout to %ld seconds.",
|
||||||
getpid(), st->connectionTimeout);
|
getpid(), st->connectionTimeout);
|
||||||
|
#else
|
||||||
|
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,
|
||||||
|
"LDAP: Connection timout option not supported by the LDAP SDK in use." );
|
||||||
|
#endif
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@@ -1811,6 +1816,7 @@ static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog,
|
|||||||
"LDAP: SSL support unavailable" );
|
"LDAP: SSL support unavailable" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef LDAP_OPT_NETWORK_TIMEOUT
|
||||||
if (st->connectionTimeout > 0) {
|
if (st->connectionTimeout > 0) {
|
||||||
timeOut.tv_sec = st->connectionTimeout;
|
timeOut.tv_sec = st->connectionTimeout;
|
||||||
}
|
}
|
||||||
@@ -1823,6 +1829,7 @@ static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog,
|
|||||||
"LDAP: Could not set the connection timeout" );
|
"LDAP: Could not set the connection timeout" );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
return(OK);
|
return(OK);
|
||||||
|
Reference in New Issue
Block a user