httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r227253 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS modules/experimental/util_ldap.c
Date Wed, 03 Aug 2005 20:01:37 GMT
Author: jorton
Date: Wed Aug  3 13:01:32 2005
New Revision: 227253

URL: http://svn.apache.org/viewcvs?rev=227253&view=rev
Log:
* 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

Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/modules/experimental/util_ldap.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=227253&r1=227252&r2=227253&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Wed Aug  3 13:01:32 2005
@@ -1,6 +1,9 @@
                                                          -*- 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

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?rev=227253&r1=227252&r2=227253&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Wed Aug  3 13:01:32 2005
@@ -388,11 +388,6 @@
         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

Modified: httpd/httpd/branches/2.0.x/modules/experimental/util_ldap.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/experimental/util_ldap.c?rev=227253&r1=227252&r2=227253&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/experimental/util_ldap.c (original)
+++ httpd/httpd/branches/2.0.x/modules/experimental/util_ldap.c Wed Aug  3 13:01:32 2005
@@ -325,7 +325,7 @@
         }
 
         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" );



Mime
View raw message