r12014@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.

svn:r9696

diff --git a/doc/TODO b/doc/TODO
index 43b95879d8bb036dabcaadbd95966804b6319720..1cf167a72ebeb6fa496cd765f3d4f4e581d7fb22 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -51,8 +51,8 @@ R   - actually cause the directory.c functions to know about or_port
         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

diff --git a/src/or/config.c b/src/or/config.c
index fa9f56e088612cf314cd97dc6a4c1736ca8b60e2..d14aadb385070e37ba820d20a81e9a6e2fbd62a7 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -584,7 +584,7 @@ typedef enum {
   /* 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 @@ static const struct {
   { "1.2",  LE_12 },
   { "1.2a", LE_12A },
   { "1.3",  LE_13 },
+  { "1.3a", LE_13A },
   { NULL, LE_OTHER }
 };
 
@@ -3907,6 +3908,9 @@ check_libevent_version(const char *m, int server)
         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",