diff options
| author | Brad King <brad.king@kitware.com> | 2023-10-12 23:05:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-10-12 23:05:59 (GMT) |
| commit | d6c81467aad117a68ce80f76c9df811d18675a42 (patch) | |
| tree | 29a2fafa1ce3301e8010f7c8a3519d64d83c4249 | |
| parent | 244bb7b6bcf06db60d592dff565c03054065706c (diff) | |
| parent | 701f52670f55830fbf0e592ffe5600a69889be8b (diff) | |
| download | CMake-d6c81467aad117a68ce80f76c9df811d18675a42.zip CMake-d6c81467aad117a68ce80f76c9df811d18675a42.tar.gz CMake-d6c81467aad117a68ce80f76c9df811d18675a42.tar.bz2 | |
Merge branch 'backport-curl-socks5-fix' into release-3.26
Merge-request: !8872
| -rw-r--r-- | Utilities/cmcurl/lib/socks.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Utilities/cmcurl/lib/socks.c b/Utilities/cmcurl/lib/socks.c index d491e08..e7da5b4 100644 --- a/Utilities/cmcurl/lib/socks.c +++ b/Utilities/cmcurl/lib/socks.c @@ -539,9 +539,9 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf, /* RFC1928 chapter 5 specifies max 255 chars for domain name in packet */ if(!socks5_resolve_local && hostname_len > 255) { - infof(data, "SOCKS5: server resolving disabled for hostnames of " - "length > 255 [actual len=%zu]", hostname_len); - socks5_resolve_local = TRUE; + failf(data, "SOCKS5: the destination hostname is too long to be " + "resolved remotely by the proxy."); + return CURLPX_LONG_HOSTNAME; } if(auth & ~(CURLAUTH_BASIC | CURLAUTH_GSSAPI)) @@ -882,7 +882,7 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf, } else { socksreq[len++] = 3; - socksreq[len++] = (char) hostname_len; /* one byte address length */ + socksreq[len++] = (unsigned char) hostname_len; /* one byte length */ memcpy(&socksreq[len], sx->hostname, hostname_len); /* w/o NULL */ len += hostname_len; } |