[or-cvs] r9696: Niels has accepted the patch from Scott Lamb to implement be (in tor/trunk: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-02-28 19:41:35 -0500 (Wed, 28 Feb 2007)
New Revision: 9696

Modified:
   tor/trunk/
   tor/trunk/doc/TODO
   tor/trunk/src/or/config.c
Log:
 r12014 at catbus:  nickm | 2007-02-28 19:41:20 -0500
 Niels has accepted the patch from Scott Lamb to implement better signal handling: I can take "get the pthread_sigprocmask situation under control" off my plate.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12014] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO	2007-03-01 00:41:33 UTC (rev 9695)
+++ tor/trunk/doc/TODO	2007-03-01 00:41:35 UTC (rev 9696)
@@ -51,8 +51,8 @@
         or_conn is full, and accept the sometimes directory data will just
         never get written.
 
-N - Libevent fixes
-    . Try to get the pthread_sigprocmask situation under control; see
+  o Libevent fixes
+    o Try to get the pthread_sigprocmask situation under control; see
       coderman's or-dev post of 20-Feb-2007.
 
   - Polishing

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-03-01 00:41:33 UTC (rev 9695)
+++ tor/trunk/src/or/config.c	2007-03-01 00:41:35 UTC (rev 9696)
@@ -584,7 +584,7 @@
   /* Note: we compare these, so it's important that "old" precede everything,
    * and that "other" come last. */
   LE_OLD=0, LE_10C, LE_10D, LE_10E, LE_11, LE_11A, LE_11B, LE_12, LE_12A,
-  LE_13,
+  LE_13, LE_13A,
   LE_OTHER
 } le_version_t;
 static le_version_t decode_libevent_version(void);
@@ -3828,6 +3828,7 @@
   { "1.2",  LE_12 },
   { "1.2a", LE_12A },
   { "1.3",  LE_13 },
+  { "1.3a", LE_13A },
   { NULL, LE_OTHER }
 };
 
@@ -3907,6 +3908,9 @@
         v,m);
     badness = "SLOW";
   }
+  /* XXXX012 if libevent 1.3b comes out before 0.1.2.x, and it works,
+   * recomment an upgrade to everybody on BSD or OSX or anywhere with
+   * that flavor of pthreads. */
   if (badness) {
     control_event_general_status(LOG_WARN,
         "BAD_LIBEVENT VERSION=%s METHOD=%s BADNESS=%s RECOVERED=NO",