[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 252/282: socks5: switch state properly when the resolve is done
From: |
gnunet |
Subject: |
[gnurl] 252/282: socks5: switch state properly when the resolve is done |
Date: |
Wed, 01 Apr 2020 14:31:57 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 4b786abc434d9802229d08d625acbf8cbb9d326f
Author: Daniel Stenberg <address@hidden>
AuthorDate: Fri Mar 6 22:32:38 2020 +0100
socks5: switch state properly when the resolve is done
Regression from 4a4b63d (and #4907)
Reported-by: vitaha85 on github
Fixes #5053
Closes #5056
---
lib/socks.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/socks.c b/lib/socks.c
index 0fb97e1e5..754726f6f 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -763,8 +763,8 @@ CURLcode Curl_SOCKS5(const char *proxy_user,
if(!dns) {
result = Curl_resolv_check(data->conn, &dns);
- /* stay in the state or error out */
- return result;
+ if(!dns)
+ return result;
}
/* FALLTHROUGH */
CONNECT_RESOLVED:
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 248/282: pause: return early for calls that don't change pause state, (continued)
- [gnurl] 248/282: pause: return early for calls that don't change pause state, gnunet, 2020/04/01
- [gnurl] 249/282: unit1612: fixed the inclusion and compilation of the HMAC unit test, gnunet, 2020/04/01
- [gnurl] 250/282: pause: bail out on bad input, gnunet, 2020/04/01
- [gnurl] 247/282: curl_share_setopt.3: Note sharing cookies doesn't enable the engine, gnunet, 2020/04/01
- [gnurl] 257/282: perl: align order and completeness of Windows OS checks, gnunet, 2020/04/01
- [gnurl] 258/282: tests: use native Sleep function as fallback on Windows, gnunet, 2020/04/01
- [gnurl] 259/282: RELEASE-NOTES: synced, gnunet, 2020/04/01
- [gnurl] 234/282: cirrus-ci: disable the FreeBSD 13 builds, gnunet, 2020/04/01
- [gnurl] 243/282: Revert "pause: force-drain the transfer on unpause", gnunet, 2020/04/01
- [gnurl] 240/282: KNOWN_BUGS: configure --with-gssapi with Heimdal is ignored on macOS, gnunet, 2020/04/01
- [gnurl] 252/282: socks5: switch state properly when the resolve is done,
gnunet <=
- [gnurl] 238/282: tests: wrap ignored test failures in braces, gnunet, 2020/04/01
- [gnurl] 255/282: seek: fix fallback for missing ftruncate on Windows, gnunet, 2020/04/01
- [gnurl] 251/282: libssh: Fix matching user-specified MD5 hex key, gnunet, 2020/04/01
- [gnurl] 256/282: tool_cb_see: set correct copyright year range, gnunet, 2020/04/01
- [gnurl] 254/282: config-win32: Windows does not have ftruncate, gnunet, 2020/04/01
- [gnurl] 262/282: runtests: fix missing use of exe_ext helper function, gnunet, 2020/04/01
- [gnurl] 261/282: ares: store dns parameters for duphandle, gnunet, 2020/04/01
- [gnurl] 266/282: lib1564: reduce number of mid-wait wakeup calls, gnunet, 2020/04/01
- [gnurl] 260/282: version: make curl_version* thread-safe without using global context, gnunet, 2020/04/01
- [gnurl] 269/282: test 1560: avoid valgrind false positives, gnunet, 2020/04/01