diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-13 13:53:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-13 13:53:42 -0400 |
| commit | 85aba48a665a96b9cbb1ca8ab4a5900b4af2451c (patch) | |
| tree | 6d73db2a84d525744f1ec38ec9ace60cf74e1ce4 /src | |
| parent | 3adef11d10aa0019f07ea10264504e82541b3aa7 (diff) | |
| parent | ff0be080598a8719032fd8c57aed9a42888b97b0 (diff) | |
| download | tor-85aba48a665a96b9cbb1ca8ab4a5900b4af2451c.tar.gz tor-85aba48a665a96b9cbb1ca8ab4a5900b4af2451c.zip | |
Merge branch 'bug26470_032'
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/or/connection_edge.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 2cc54f7749..35e68485b8 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -2807,8 +2807,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); |