[or-cvs] r9842: backport r9841. phooey, there'll be another rc. (in tor/branches/tor-0_1_2-patches: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-03-16 02:58:19 -0400 (Fri, 16 Mar 2007)
New Revision: 9842

Modified:
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/dirserv.c
Log:
backport r9841.
phooey, there'll be another rc.


Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-03-16 06:55:09 UTC (rev 9841)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-03-16 06:58:19 UTC (rev 9842)
@@ -1,3 +1,11 @@
+Changes in version 0.1.2.12-rc - 2007-03-??
+  o Major bugfixes:
+    - Fix an infinite loop introduced in 0.1.2.7-alpha when we serve
+      directory information requested inside Tor connections (i.e. via
+      begin_dir cells). It only triggered when the same connection was
+      serving other data at the same time. Reported by seeess.
+
+
 Changes in version 0.1.2.11-rc - 2007-03-15
   o Minor bugfixes (controller), reported by daejees:
     - Correct the control spec to match how the code actually responds

Modified: tor/branches/tor-0_1_2-patches/src/or/dirserv.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/dirserv.c	2007-03-16 06:55:09 UTC (rev 9841)
+++ tor/branches/tor-0_1_2-patches/src/or/dirserv.c	2007-03-16 06:58:19 UTC (rev 9842)
@@ -2081,8 +2081,8 @@
 {
   dir_connection_t *dir_conn, *next;
 
-  while (or_conn->blocked_dir_connections) {
-    dir_conn = or_conn->blocked_dir_connections;
+  dir_conn = or_conn->blocked_dir_connections;
+  while (dir_conn) {
     next = dir_conn->next_blocked_on_same_or_conn;
 
     dir_conn->is_blocked_on_or_conn = 0;