[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r10809: Backport r10478: stop tearing down entire circuits just beca (in tor/branches/tor-0_1_2-patches: . src/or)
Date: 2007-07-12 12:17:27 -0400 (Thu, 12 Jul 2007)
New Revision: 10809
r13716@catbus: nickm | 2007-07-12 12:12:45 -0400
Backport r10478: stop tearing down entire circuits just because the user asked for a nonexistent hidden service port.
Property changes on: tor/branches/tor-0_1_2-patches
svk:merge ticket from /tor/012 [r13716] on 8246c3cf-6607-4228-993b-4d95d33730f1
--- tor/branches/tor-0_1_2-patches/ChangeLog 2007-07-12 16:17:25 UTC (rev 10808)
+++ tor/branches/tor-0_1_2-patches/ChangeLog 2007-07-12 16:17:27 UTC (rev 10809)
@@ -15,6 +15,11 @@
- Count the number of authorities that recommend each version
correctly. Previously, we were under-counting by 1.
+ o Minor bugfixes (hidden services):
+ - Stop tearing down the whole circuit when the user asks for a
+ connection to a port that the hidden service didn't configure.
+ Resolves bug 444.
o Minor bugfixes (misc)
- On Windows, we were preventing other processes from reading
cached-routers while Tor was running. (Reported by janbar)
--- tor/branches/tor-0_1_2-patches/src/or/connection_edge.c 2007-07-12 16:17:25 UTC (rev 10808)
+++ tor/branches/tor-0_1_2-patches/src/or/connection_edge.c 2007-07-12 16:17:27 UTC (rev 10809)
@@ -2204,8 +2204,6 @@
relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
end_payload, 1, NULL);
- /* knock the whole thing down, somebody screwed up */
- circuit_mark_for_close(circ, END_CIRC_REASON_CONNECTFAILED);