diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2015-06-17 00:30:06 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-06-17 14:00:12 +0200 |
| commit | b88f980a7437abc1159a1185c04d381347c8f5b1 (patch) | |
| tree | 870afd06338a85f7dac3e1211dfd4a90c4860325 /lib/http_proxy.h | |
| parent | 85739723ba9536cb1458f4bd2d00df4691b59bb1 (diff) | |
FTP: do the HTTP CONNECT for data connection blocking
** WORK-AROUND **
The introduced non-blocking general behaviour for Curl_proxyCONNECT()
didn't work for the data connection establishment unless it was very
fast. The newly introduced function argument makes it operate in a more
blocking manner, more like it used to work in the past. This blocking
approach is only used when the FTP data connecting through HTTP proxy.
Blocking like this is bad. A better fix would make it work more
asynchronously.
Bug: https://github.com/bagder/curl/issues/278
Diffstat (limited to 'lib/http_proxy.h')
| -rw-r--r-- | lib/http_proxy.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/http_proxy.h b/lib/http_proxy.h index 2b5e9c9b4..058a29db9 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) |