Commit fix for bug 807 from mwenge: send CLOSED controller event for reverse dns...

svn:r16985

diff --git a/ChangeLog b/ChangeLog
index f2114f112f3406a8c788e9b27c87aba9ce772c96..aa1abac5fd80b4f287799dd9ffdc487d7440a1d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,10 @@ Changes in version 0.2.1.6-alpha - 2008-09-xx
       had met our limits precisely. Fixes bug 824. Patch from by rovv.
       Bugfix on 0.2.0.x (??).
 
+  o Minor bugfixes (controller):
+    - Make DNS resolved events into "CLOSED", not "FAILED".  Bugfix on
+      0.1.2.5-alpha.  Fix by Robert Hogan.  Resolves bug 807.
+
   o Minor features:
     - Update to the "September 1 2008" ip-to-country file.
     - Allow ports 465 and 587 in the default exit policy again. We had

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 4d054a88a658d8ba40dad04f6d8de96d965d18f1..bd53c9beeac1d14feaa0fcf3138029776c369075 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1389,8 +1389,7 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn,
                                              map_expires);
       connection_mark_unattached_ap(conn,
                                 END_STREAM_REASON_DONE |
-                                END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED |
-                                END_STREAM_REASON_FLAG_ALREADY_SENT_CLOSED);
+                                END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
       return 0;
     }
     if (options->ClientDNSRejectInternalAddresses) {