From e16373a732d507dc8065352d397f74d522f210b5 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 25 Sep 2011 16:32:43 +0200 Subject: [PATCH] In connection_ap_handshake_process_socks(), mark the socks request as finished if a reply is send after a parse error Silences the log message: [warn] {BUG} _connection_mark_unattached_ap(): Bug: stream (marked at connection_edge.c:2224) sending two socks replies? after the client triggered the "Tor is not an HTTP Proxy" response. No additional socks reply was sent, though. --- src/or/connection_edge.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index f59f44c..6ebedbb 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2208,6 +2208,11 @@ connection_ap_handshake_process_socks(entry_connection_t *conn) connection_write_to_buf((const char*)socks->reply, socks->replylen, base_conn); socks->replylen = 0; + if (sockshere == -1) { + /* An invalid request just got a reply, no additional + * one is necessary. */ + socks->has_finished = 1; + } } if (sockshere == 0) { -- 1.7.6