You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2005/02/01 18:09:58 UTC
svn commit: r149419 - httpd/httpd/trunk/modules/ldap/util_ldap.c
Author: bnicholes
Date: Tue Feb 1 09:09:56 2005
New Revision: 149419
URL: http://svn.apache.org/viewcvs?view=rev&rev=149419
Log:
Set the connection timeout for LDAP SDK's that support the option. For SDK's that don't, log a warning message.
Modified:
httpd/httpd/trunk/modules/ldap/util_ldap.c
Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ldap/util_ldap.c?view=diff&r1=149418&r2=149419
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Tue Feb 1 09:09:56 2005
@@ -1605,11 +1605,16 @@
return err;
}
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
st->connectionTimeout = atol(ttl);
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, cmd->server,
"[%d] ldap connection: Setting connection timeout to %ld seconds.",
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;
}
@@ -1811,6 +1816,7 @@
"LDAP: SSL support unavailable" );
}
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
if (st->connectionTimeout > 0) {
timeOut.tv_sec = st->connectionTimeout;
}
@@ -1823,6 +1829,7 @@
"LDAP: Could not set the connection timeout" );
}
}
+#endif
return(OK);