diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-03-01 00:41:35 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-03-01 00:41:35 +0000 |
| commit | 2780bb74c8a3ac959284454db1ca91ba9c4f7b12 (patch) | |
| tree | e8687b3948db1ac47f9a797a8d2ce24d874caa86 | |
| parent | df5a8aa931f0d745d7e9bc82fdcfc3e780442166 (diff) | |
| download | tor-2780bb74c8a3ac959284454db1ca91ba9c4f7b12.tar tor-2780bb74c8a3ac959284454db1ca91ba9c4f7b12.tar.gz | |
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
| -rw-r--r-- | doc/TODO | 4 | ||||
| -rw-r--r-- | src/or/config.c | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -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 fa9f56e08..d14aadb38 100644 --- 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", |