[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 273/411: libssh2: fix build with disabled proxy support
From: |
gnunet |
Subject: |
[gnurl] 273/411: libssh2: fix build with disabled proxy support |
Date: |
Wed, 13 Jan 2021 01:21:28 +0100 |
This is an automated email from the git hooks/post-receive script.
nikita pushed a commit to branch master
in repository gnurl.
commit ddcc110bfc7aba4c0d73d2bacdfa7bd48a34bde6
Author: Baruch Siach <baruch@tkos.co.il>
AuthorDate: Mon Oct 26 06:56:49 2020 +0200
libssh2: fix build with disabled proxy support
Build breaks because the http_proxy field is missing:
vssh/libssh2.c:3119:10: error: 'struct connectdata' has no member named
'http_proxy'
Regression from #6021, shipped in curl 7.73.0
Closes #6125
---
lib/vssh/libssh2.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
index 6c6db049b..b9ed5be90 100644
--- a/lib/vssh/libssh2.c
+++ b/lib/vssh/libssh2.c
@@ -3017,6 +3017,7 @@ static CURLcode ssh_setup_connection(struct connectdata
*conn)
static Curl_recv scp_recv, sftp_recv;
static Curl_send scp_send, sftp_send;
+#ifndef CURL_DISABLE_PROXY
static ssize_t ssh_tls_recv(libssh2_socket_t sock, void *buffer,
size_t length, int flags, void **abstract)
{
@@ -3052,6 +3053,7 @@ static ssize_t ssh_tls_send(libssh2_socket_t sock, const
void *buffer,
Curl_debug(conn->data, CURLINFO_DATA_OUT, (char *)buffer, (size_t)nwrite);
return nwrite;
}
+#endif
/*
* Curl_ssh_connect() gets called from Curl_protocol_connect() to allow us to
@@ -3094,6 +3096,7 @@ static CURLcode ssh_connect(struct connectdata *conn,
bool *done)
return CURLE_FAILED_INIT;
}
+#ifndef CURL_DISABLE_PROXY
if(conn->http_proxy.proxytype == CURLPROXY_HTTPS) {
/*
* This crazy union dance is here to avoid assigning a void pointer a
@@ -3132,7 +3135,9 @@ static CURLcode ssh_connect(struct connectdata *conn,
bool *done)
libssh2_session_callback_set(ssh->ssh_session,
LIBSSH2_CALLBACK_SEND, sshsend.sendp);
}
- else if(conn->handler->protocol & CURLPROTO_SCP) {
+ else
+#endif /* CURL_DISABLE_PROXY */
+ if(conn->handler->protocol & CURLPROTO_SCP) {
conn->recv[FIRSTSOCKET] = scp_recv;
conn->send[FIRSTSOCKET] = scp_send;
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnurl] 210/411: vtls: deduplicate some DISABLE_PROXY ifdefs, (continued)
- [gnurl] 210/411: vtls: deduplicate some DISABLE_PROXY ifdefs, gnunet, 2021/01/12
- [gnurl] 248/411: urlapi: URL encode a '+' in the query part, gnunet, 2021/01/12
- [gnurl] 257/411: CURLOPT_NOBODY.3: fix typo, gnunet, 2021/01/12
- [gnurl] 256/411: CI/azure: improve on flakiness by avoiding libtool wrappers, gnunet, 2021/01/12
- [gnurl] 221/411: runtests: add %repeat[]% for test files, gnunet, 2021/01/12
- [gnurl] 294/411: header.d: fix syntax mistake, gnunet, 2021/01/12
- [gnurl] 333/411: docs: document the 8MB input string limit, gnunet, 2021/01/12
- [gnurl] 289/411: header.d: mention the "Transfer-Encoding: chunked" handling, gnunet, 2021/01/12
- [gnurl] 297/411: tool_debug_cb: do not assume zero-terminated data, gnunet, 2021/01/12
- [gnurl] 311/411: curl.se: new home, gnunet, 2021/01/12
- [gnurl] 273/411: libssh2: fix build with disabled proxy support,
gnunet <=
- [gnurl] 253/411: openssl: acknowledge SRP disabling in configure properly, gnunet, 2021/01/12
- [gnurl] 271/411: CI/appveyor: remove (unused) runtests.pl -b option, gnunet, 2021/01/12
- [gnurl] 268/411: cmake: set the unicode feature in curl-config on Windows, gnunet, 2021/01/12
- [gnurl] 270/411: tool_help: make "output" description less confusing, gnunet, 2021/01/12
- [gnurl] 275/411: range.d: clarify that curl will not parse multipart responses, gnunet, 2021/01/12
- [gnurl] 347/411: KNOWN_BUGS: cmake uses -lpthread instead of Threads::Threads, gnunet, 2021/01/12
- [gnurl] 353/411: quiche: remove 'static' from local buffer, gnunet, 2021/01/12
- [gnurl] 193/411: sendf: move Curl_sendf to dict.c and make it static, gnunet, 2021/01/12
- [gnurl] 205/411: include/README: convert to markdown, gnunet, 2021/01/12
- [gnurl] 258/411: os400: Sync libcurl API options, gnunet, 2021/01/12