diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-02-14 16:16:54 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-02-14 16:17:05 +0100 |
| commit | 692cb461056f012162470d183b3529429777c8bc (patch) | |
| tree | fa035083bb751b08afb0eb07b8ec14732c1c013d /lib/socks_gssapi.c | |
| parent | af9afd8b17dc6acecf76d6a95e8971b7788f7bba (diff) | |
| download | curl-bagder/socks-nonblocking.tar.gz | |
socks: make the connect phase non-blockingbagder/socks-nonblocking
Removes two entries from KNOWN_BUGS.
Closes #4907
Diffstat (limited to 'lib/socks_gssapi.c')
| -rw-r--r-- | lib/socks_gssapi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c index 65294bbeb..97ee7183e 100644 --- a/lib/socks_gssapi.c +++ b/lib/socks_gssapi.c @@ -5,8 +5,8 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * + * Copyright (C) 2012 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2009, Markus Moeller, <markus_moeller@compuserve.com> - * Copyright (C) 2012 - 2018, 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 @@ -167,6 +167,8 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, return CURLE_COULDNT_CONNECT; } + (void)curlx_nonblock(sock, FALSE); + /* As long as we need to keep sending some context info, and there's no */ /* errors, keep sending it... */ for(;;) { @@ -513,6 +515,8 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, gss_release_buffer(&gss_status, &gss_recv_token); } + (void)curlx_nonblock(sock, TRUE); + infof(data, "SOCKS5 access with%s protection granted.\n", (socksreq[0] == 0)?"out GSS-API data": ((socksreq[0] == 1)?" GSS-API integrity":" GSS-API confidentiality")); |