[or-cvs] backport:

[arma@xxxxxxxx (Roger Dingledine)]

Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/0091/tor/src/or

Modified Files:
      Tag: tor-0_0_9-patches
	dns.c 
Log Message:
backport:
fix duplicate dns_cancel_pending_resolve reported by Giorgos Pallas


Index: dns.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dns.c,v
retrieving revision 1.126.2.2
retrieving revision 1.126.2.3
diff -u -d -r1.126.2.2 -r1.126.2.3
--- dns.c	4 Jan 2005 06:21:42 -0000	1.126.2.2
+++ dns.c	4 Jan 2005 11:35:28 -0000	1.126.2.3
@@ -568,7 +568,10 @@
 int connection_dns_reached_eof(connection_t *conn) {
   log_fn(LOG_WARN,"Read eof. Worker died unexpectedly.");
   if (conn->state == DNSWORKER_STATE_BUSY) {
-    dns_cancel_pending_resolve(conn->address);
+    /* don't cancel the resolve here -- it would be cancelled in
+     * connection_about_to_close_connection(), since conn is still
+     * in state BUSY
+     */
     num_dnsworkers_busy--;
   }
   num_dnsworkers--;