diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2015-06-24 23:34:51 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-06-24 23:34:51 +0200 |
| commit | f87a3d736f3200029c8bed3ab4dad50f9680be7a (patch) | |
| tree | 7db1fde8016a6f576d7cba006365f461aaee00d0 /lib/http_proxy.h | |
| parent | bf5218c85eba8d13c6c40a8047b8018b4ff5f1ed (diff) | |
| parent | f44b803f1605edcfc4058b1a818c44552f0affec (diff) | |
| download | curl-f87a3d736f3200029c8bed3ab4dad50f9680be7a.tar.gz | |
Merge branch 'master' into http2-pushhttp2-push
Diffstat (limited to 'lib/http_proxy.h')
| -rw-r--r-- | lib/http_proxy.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/http_proxy.h b/lib/http_proxy.h index 2b5e9c9b4..9c4f0207d 100644 --- a/lib/http_proxy.h +++ b/lib/http_proxy.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2015, 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 @@ -26,7 +26,8 @@ /* ftp can use this as well */ CURLcode Curl_proxyCONNECT(struct connectdata *conn, int tunnelsocket, - const char *hostname, int remote_port); + const char *hostname, int remote_port, + bool blocking); /* Default proxy timeout in milliseconds */ #define PROXY_TIMEOUT (3600*1000) @@ -34,7 +35,7 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn, CURLcode Curl_proxy_connect(struct connectdata *conn); #else -#define Curl_proxyCONNECT(x,y,z,w) CURLE_NOT_BUILT_IN +#define Curl_proxyCONNECT(x,y,z,w,v) CURLE_NOT_BUILT_IN #define Curl_proxy_connect(x) CURLE_OK #endif |