[gnurl] 273/411: libssh2: fix build with disabled proxy support

[gnunet]

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.