From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 10 Mar 2012 11:06:09 +0000 (+0000)
Subject: In case of SOCKS5 failures, do not explicitly log the server's response
X-Git-Tag: v_3_0_20~388
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=430b87b899c9294875101eee7faca82880a111e1

In case of SOCKS5 failures, do not explicitly log the server's response

It hasn't helped so far and the response can already
be logged by enabling "debug 32768" anyway.

This reverts v1.81 and the follow-up bug fix v1.84.
---

diff --git a/gateway.c b/gateway.c
index be318dea..f36ed010 100644
--- a/gateway.c
+++ b/gateway.c
@@ -1,4 +1,4 @@
-const char gateway_rcs[] = "$Id: gateway.c,v 1.85 2012/03/09 16:23:50 fabiankeil Exp $";
+const char gateway_rcs[] = "$Id: gateway.c,v 1.86 2012/03/09 17:55:50 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.c,v $
@@ -1116,16 +1116,7 @@ static jb_socket socks5_connect(const struct forward_spec *fwd,
 
    assert(errstr != NULL);
    csp->error_message = strdup(errstr);
-   if (server_size == -1)
-   {
-      /*
-       * We didn't read() anything from the server at all.
-       * Don't try to log a negative number of characters
-       * which could trigger an assert().
-       */
-      server_size = 0;
-   }
-   log_error(LOG_LEVEL_CONNECT, "socks5_connect: %s: %N", errstr, server_size, sbuf);
+   log_error(LOG_LEVEL_CONNECT, "socks5_connect: %s", errstr);
    close_socket(sfd);
    errno = EINVAL;