diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-02 10:37:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-02 10:37:00 -0400 |
| commit | 7ccaf3f1a485ece89e6bf27e419f16dc9e88d891 (patch) | |
| tree | 1e7dec03ec5c8d77e2189e55c259d360124d4f7a /src/or | |
| parent | e755e146bd700f56827db57e78d3b8582773fdb5 (diff) | |
| parent | 2c155064aaa77d5a59169388c89723b8dd53d589 (diff) | |
| download | tor-7ccaf3f1a485ece89e6bf27e419f16dc9e88d891.tar.gz tor-7ccaf3f1a485ece89e6bf27e419f16dc9e88d891.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/connection.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 5585ddf49f..863964b4c3 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3550,6 +3550,10 @@ connection_handle_write_impl(connection_t *conn, int force) if (result < 0) { if (CONN_IS_EDGE(conn)) connection_edge_end_errno(TO_EDGE_CONN(conn)); + if (conn->type == CONN_TYPE_AP) { + /* writing failed; we couldn't send a SOCKS reply if we wanted to */ + TO_ENTRY_CONN(conn)->socks_request->has_finished = 1; + } connection_close_immediate(conn); /* Don't flush; connection is dead. */ connection_mark_for_close(conn); |