Commit 78d7d2b0 authored by Joe Orton's avatar Joe Orton
Browse files

* modules/experimental/util_ldap.c (util_ldap_connection_open): Set 

connection timeout on the connection, not globally, avoiding segfaults
in older version of OpenLDAP (ITS #3487).

Submitted by: Brad Nicholes
Reviewed by: jorton, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@227253 13f79535-47bb-0310-9956-ffa450edef68
parent f67f77d5

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.0.55













  *) mod_ldap: Avoid segfaults when opening connections if using a version













     of OpenLDAP older than 2.2.21.  [Brad Nicholes]



























  *) mod_ssl: Fix build with OpenSSL 0.9.8.  PR 35757.  [William Rowe]





























  *) SECURITY: CAN-2005-2088

































STATUS



+0
−5






























Original line number
Diff line number
Diff line








@@ -388,11 +388,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:













        http://svn.apache.org/viewcvs.cgi?rev=209539&view=rev















        +1: pquerna





























     *) mod_ldap: Fix for use of OpenLDAP < 2.2.21













        (regression since 2.0.54)













        http://people.apache.org/~jorton/ap_ldapver2.diff













        +1: jorton





























     *) mod_ldap: Fix cache corruption case.















        http://svn.apache.org/viewcvs?rev=225746&view=rev















        PR: 34209

































modules/experimental/util_ldap.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -325,7 +325,7 @@ LDAP_DECLARE(int) util_ldap_connection_open(request_rec *r,













        }































        if (st->connectionTimeout >= 0) {













            rc = ldap_set_option(NULL, LDAP_OPT_NETWORK_TIMEOUT, (void *)&timeOut);













            rc = ldap_set_option(ldc->ldap, LDAP_OPT_NETWORK_TIMEOUT, (void *)&timeOut);















            if (APR_SUCCESS != rc) {















                ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,















                                 "LDAP: Could not set the connection timeout" );