nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Browse Source
This commit is contained in:
Nick Mathewson 2013-06-10 12:26:39 -04:00
commit 607b29ae1a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug9017 Normal file
View File

@ -0,0 +1,6 @@
o Major bugfixes:
- Avoid an assertion failure on OpenBSD (and perhaps other BSDs)
when an exit connection with optimistic data succeeds immediately
rather than returning EINPROGRESS. Fixes bug 9017; bugfix on
0.2.3.1-alpha.

9
src/or/connection_edge.c
View File

@ -2652,12 +2652,13 @@ connection_exit_connect(edge_connection_t *edge_conn)
conn->state = EXIT_CONN_STATE_OPEN; conn->state = EXIT_CONN_STATE_OPEN;
if (connection_get_outbuf_len(conn)) { if (connection_get_outbuf_len(conn)) {
/* in case there are any queued data cells */ /* in case there are any queued data cells, from e.g. optimistic data */
log_warn(LD_BUG,"newly connected conn had data waiting!"); IF_HAS_NO_BUFFEREVENT(conn)
// connection_start_writing(conn); connection_watch_events(conn, READ_EVENT|WRITE_EVENT);
} } else {
IF_HAS_NO_BUFFEREVENT(conn) IF_HAS_NO_BUFFEREVENT(conn)
connection_watch_events(conn, READ_EVENT); connection_watch_events(conn, READ_EVENT);
}
/* also, deliver a 'connected' cell back through the circuit. */ /* also, deliver a 'connected' cell back through the circuit. */
if (connection_edge_is_rendezvous_stream(edge_conn)) { if (connection_edge_is_rendezvous_stream(edge_conn)) {