[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 18/208: http-proxy: fix build with --disable-proxy
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 18/208: http-proxy: fix build with --disable-proxy or --disable-http |
Date: |
Wed, 09 Aug 2017 17:33:35 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.
commit 0d39e5cc95177b0255c32b24b9907dd67bf56252
Author: Daniel Stenberg <address@hidden>
AuthorDate: Thu Jun 15 23:57:31 2017 +0200
http-proxy: fix build with --disable-proxy or --disable-http
Reported-by: Dan Fandrich
---
lib/http_proxy.c | 5 +++++
lib/http_proxy.h | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index cd5e7c269..380eded2e 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -677,5 +677,10 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
return result;
}
+#else
+void Curl_connect_free(struct Curl_easy *data)
+{
+ (void)data;
+}
#endif /* CURL_DISABLE_PROXY */
diff --git a/lib/http_proxy.h b/lib/http_proxy.h
index bd9d6f590..2e50adc8f 100644
--- a/lib/http_proxy.h
+++ b/lib/http_proxy.h
@@ -35,11 +35,14 @@ CURLcode Curl_proxy_connect(struct connectdata *conn, int
sockindex);
bool Curl_connect_complete(struct connectdata *conn);
bool Curl_connect_ongoing(struct connectdata *conn);
-void Curl_connect_free(struct Curl_easy *data);
#else
#define Curl_proxyCONNECT(x,y,z,w) CURLE_NOT_BUILT_IN
#define Curl_proxy_connect(x,y) CURLE_OK
+#define Curl_connect_complete(x) CURLE_OK
+#define Curl_connect_ongoing(x) FALSE
#endif
+void Curl_connect_free(struct Curl_easy *data);
+
#endif /* HEADER_CURL_HTTP_PROXY_H */
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 06/208: http-proxy: do the HTTP CONNECT process entirely non-blocking, (continued)
- [GNUnet-SVN] [gnurl] 06/208: http-proxy: do the HTTP CONNECT process entirely non-blocking, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 05/208: progress: let "current speed" be UL + DL speeds combined, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 09/208: curl: allow --header and --proxy-header read from file, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 20/208: dist: add the fuzz dir to the tarball, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 04/208: system.h: fix MinGW build, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 03/208: timers: store internal time stamps as time_t instead of doubles, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 12/208: curl_setup.h: error out on CURL_WANTS_CA_BUNDLE_ENV use, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 07/208: curl/curlver.h: start working on 7.55.0, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 08/208: RELEASE-NOTES: synced with 2ad80eec5, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 11/208: lib/curl_setup.h: remove CURL_WANTS_CA_BUNDLE_ENV, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 18/208: http-proxy: fix build with --disable-proxy or --disable-http,
gnunet <=
- [GNUnet-SVN] [gnurl] 15/208: fuzz: bring oss-fuzz initial code converted to C89, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 10/208: test1147: verify -H on a file, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 16/208: fuzz: corpora file structure, initial commit, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 14/208: http-proxy: only attempt FTP over HTTP proxy, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 27/208: libtest/libntlmconnect: fix compiler warnings from f94fcdb, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 23/208: test1061: mark as flaky, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 21/208: mk-ca-bundle.pl: Check curl's exit code after certdata download, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 28/208: http-proxy: deal with EAGAIN, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 19/208: configure: disable nghttp2 too if HTTP has been disabled, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 39/208: http_proxy: fix compiler warning, gnunet, 2017/08/09