tor

commit bfe8f50cc80acaf17ded5f2a01fdd8ced0db6ace
parent f288f2478a5d455cd151e8fd13fe3ed66dfd75e5
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  2 Nov 2018 09:06:37 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

Diffstat:
A
changes/bug26470
 | 
4
++++
M
src/or/connection_edge.c
 | 
5
++++-

2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/changes/bug26470 b/changes/bug26470
@@ -0,0 +1,4 @@
+  o Minor bugfixes (HTTP tunnel):
+    - Fix a bug warning when closing an HTTP tunnel connection due to
+      an HTTP request we couldn't handle. Fixes bug 26470; bugfix on
+      0.3.2.1-alpha.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
@@ -2556,8 +2556,11 @@ connection_ap_process_http_connect(entry_connection_t *conn)
  err:
   if (BUG(errmsg == NULL))
     errmsg = "HTTP/1.0 400 Bad Request\r\n\r\n";
-  log_warn(LD_EDGE, "Saying %s", escaped(errmsg));
+  log_info(LD_EDGE, "HTTP tunnel error: saying %s", escaped(errmsg));
   connection_buf_add(errmsg, strlen(errmsg), ENTRY_TO_CONN(conn));
+  /* Mark it as "has_finished" so that we don't try to send an extra socks
+   * reply. */
+  conn->socks_request->has_finished = 1;
   connection_mark_unattached_ap(conn,
                                 END_STREAM_REASON_HTTPPROTOCOL|
                                 END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);