Backport: Warn the user if libevent is 1.1a or earlier and they are using kqueue or win32 methods.

svn:r8484

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 8fe89f007e..6bbe71f8ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,7 +17,8 @@ Changes in version 0.1.1.24 - 2006-09-xx [ongoing]
     - Fix NetBSD bug that could allow someone to force uninitialized RAM
       to be sent to a server's DNS resolver. This only affects NetBSD and
       other platforms that do not bounds-check tolower().
-
+    - Warn when using libevent 1.1a or earlier with win32 or kqueue
+      methods: these are known to be buggy.
 
 Changes in version 0.1.1.23 - 2006-07-30
   o Major bugfixes:
diff --git a/src/or/config.c b/src/or/config.c
index d8ae9a47c2..3043d2ad03 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3591,7 +3591,7 @@ check_libevent_version(const char *m, const char *v, int server)
 
   if (!strcmp(m, "kqueue")) {
     if (!strcmp(v, "1.0c") || !strcmp(v, "1.0d") || !strcmp(v, "1.0e") ||
-        !strcmp(v, "1.1")) {
+        !strcmp(v, "1.1") || !strcmp(v, "1.1a")) {
       buggy = 1;
     }
   } else if (!strcmp(m, "epoll")) {
@@ -3605,6 +3605,11 @@ check_libevent_version(const char *m, const char *v, int server)
   } else if (!strcmp(m, "poll")) {
     if (!strcmp(v, "1.0c") || !strcmp(v, "1.0d") || !strcmp(v, "1.0e"))
       slow = 1;
+  } else if (!strcmp(m, "win32")) {
+    if (!strcmp(v, "1.0c") || !strcmp(v, "1.0d") || !strcmp(v, "1.0e") ||
+        !strcmp(v, "1.1") || !strcmp(v, "1.1a")) {
+      buggy = 1;
+    }
   }
 
   if (buggy) {