mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
Fix a problem where SSL was started twice when no client certificates were
specified. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125733 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -310,6 +310,8 @@ LDAP_DECLARE(int) util_ldap_connection_open(request_rec *r,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* switch on SSL/TLS */
|
/* switch on SSL/TLS */
|
||||||
|
if (!apr_is_empty_array(ldc->client_certs)) {
|
||||||
|
|
||||||
apr_ldap_set_option(ldc->pool, ldc->ldap,
|
apr_ldap_set_option(ldc->pool, ldc->ldap,
|
||||||
APR_LDAP_OPT_TLS, &ldc->secure, &(result));
|
APR_LDAP_OPT_TLS, &ldc->secure, &(result));
|
||||||
if (LDAP_SUCCESS != result->rc) {
|
if (LDAP_SUCCESS != result->rc) {
|
||||||
@@ -319,6 +321,7 @@ LDAP_DECLARE(int) util_ldap_connection_open(request_rec *r,
|
|||||||
ldc->reason = result->reason;
|
ldc->reason = result->reason;
|
||||||
return(result->rc);
|
return(result->rc);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* Set the alias dereferencing option */
|
/* Set the alias dereferencing option */
|
||||||
ldap_set_option(ldc->ldap, LDAP_OPT_DEREF, &(ldc->deref));
|
ldap_set_option(ldc->ldap, LDAP_OPT_DEREF, &(ldc->deref));
|
||||||
|
Reference in New Issue
Block a user