Commit ee1a4e1c authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

Set the connection timeout for LDAP SDK's that support the option. For SDK's... 

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
parent b3042330

modules/ldap/util_ldap.c

+7 −0
Changes for modules/ldap/util_ldap.c: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1605,11 +1605,16 @@ static const char *util_ldap_set_connection_timeout(cmd_parms *cmd, void *dummy, 
        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 @@ static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, 
                         "LDAP: SSL support unavailable" );

    }



#ifdef LDAP_OPT_NETWORK_TIMEOUT

    if (st->connectionTimeout > 0) {

        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" );

        }

    }

#endif



    

    return(OK);