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.


svn:r10809

2 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9139d1361c..7b5fd19b4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,11 @@ Changes in version 0.1.2.15 - 2007-0?-??
     - 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)
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index e2632689f6..cf34952f90 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2204,8 +2204,6 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ)
       relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
                                    end_payload, 1, NULL);
       connection_free(TO_CONN(n_stream));
-      /* knock the whole thing down, somebody screwed up */
-      circuit_mark_for_close(circ, END_CIRC_REASON_CONNECTFAILED);
       tor_free(address);
       return 0;
     }