diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-04-04 16:24:37 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-04-04 19:38:00 +0200 |
| commit | 02dbfa21921aded6bba292b99dd224fe450e7254 (patch) | |
| tree | 73794776eccad853522867c7c755b0bdeda3672f /lib/openldap.c | |
| parent | 9d1e914a56e8a4030d8917875eaedaddf5cff97c (diff) | |
http-proxy: move proxy code to http_proxy.c
The new http_proxy.* files now host HTTP proxy specific code (500+ lines
moved out from http.c), and as a consequence there is a macro introduced
for the Curl_proxyCONNECT() function so that code can use it without
actually supporting proxy (or HTTP) in builds.
Diffstat (limited to 'lib/openldap.c')
| -rw-r--r-- | lib/openldap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/openldap.c b/lib/openldap.c index dd008800a..3cb796380 100644 --- a/lib/openldap.c +++ b/lib/openldap.c @@ -6,6 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2010, Howard Chu, <hyc@openldap.org> + * Copyright (C) 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -45,6 +46,7 @@ #include "curl_ldap.h" #include "curl_memory.h" #include "curl_base64.h" +#include "http_proxy.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -201,7 +203,6 @@ static CURLcode ldap_connect(struct connectdata *conn, bool *done) ldap_set_option(li->ld, LDAP_OPT_PROTOCOL_VERSION, &proto); -#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY) if(conn->bits.tunnel_proxy && conn->bits.httpproxy) { /* for LDAP over HTTP proxy */ struct HTTP http_proxy; @@ -228,7 +229,6 @@ static CURLcode ldap_connect(struct connectdata *conn, bool *done) if(CURLE_OK != result) return result; } -#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_PROXY */ #ifdef USE_SSL if (conn->handler->flags & PROTOPT_SSL) { |