Commit e96d22e9 authored Mar 18, 2008 by Nick Mathewson

r18941@catbus: nickm | 2008-03-18 14:59:43 -0400

 Likely fix for bug 632: do not call start_reading on a placeholder connection.


svn:r14109

parent a62a2403

ChangeLog

+5 −0

Original line number	Diff line number	Diff line
		Changes in version 0.2.1.1-alpha - 2008-??-??
		o Major bugfixes:
		- Fix assertion failure that could occur when a blocked circuit became
		unblocked, and it had pending client DNS requests. Bugfix on
		0.2.0.1-alpha. Fixes bug 632.

		o Minor bugfixes:
		- Stop giving double-close warn when we reject an address for client DNS.
		- On Windows, correctly detect errors when listing the contents of a

src/or/relay.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1813,6 +1813,12 @@ set_streams_blocked_on_circ(circuit_t circ, or_connection_t orconn,
		connection_t *conn = TO_CONN(edge);
		conn->edge_blocked_on_circ = block;

		if (!conn->read_event) {
		/* This connection is a placeholder for something; probably a DNS
		* request. It can't actually stop or start reading.*/
		continue;
		}

		if (block) {
		if (connection_is_reading(conn))
		connection_stop_reading(conn);