diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-02 09:06:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-02 09:06:37 -0400 |
| commit | bfe8f50cc80acaf17ded5f2a01fdd8ced0db6ace (patch) | |
| tree | 97e17a98398fb9a85b03dd54b1a59a89a49447d3 | |
| parent | f288f2478a5d455cd151e8fd13fe3ed66dfd75e5 (diff) | |
| parent | 6bd069630a64e540cb118ad84c2bcbb470ce92f8 (diff) | |
| download | tor-bfe8f50cc80acaf17ded5f2a01fdd8ced0db6ace.tar.gz tor-bfe8f50cc80acaf17ded5f2a01fdd8ced0db6ace.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
| -rw-r--r-- | changes/bug26470 | 4 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changes/bug26470 b/changes/bug26470 new file mode 100644 index 0000000000..854ec7ea72 --- /dev/null +++ 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 index a21002fcad..3ae5db9588 100644 --- 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); |