From 27ce38b618025682465e369fd19699ae849d8cd2 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 1 Jun 2011 17:27:28 -0400 Subject: [PATCH 1/6] Avoid a segfault when all methods are disabled or broken --- event.c | 1 + 1 file changed, 1 insertion(+) diff --git a/event.c b/event.c index 41c7d8f4..99d2eec5 100644 --- a/event.c +++ b/event.c @@ -603,6 +603,7 @@ event_base_new_with_config(const struct event_config *cfg) if (base->evbase == NULL) { event_warnx("%s: no event mechanism available", __func__); + base->evsel = NULL; event_base_free(base); return NULL; } From bdfb8330dfcf865fbfe82184cf0db85304c943b2 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 3 Jun 2011 17:06:17 -0400 Subject: [PATCH 2/6] Fix regress_ssl.c build on openbsd --- test/regress_ssl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/test/regress_ssl.c b/test/regress_ssl.c index e16bf8b3..6bc5f320 100644 --- a/test/regress_ssl.c +++ b/test/regress_ssl.c @@ -30,6 +30,7 @@ #endif #ifndef WIN32 +#include #include #include #endif From 7283facdb9741cfd7ab5df3574d9afa619258501 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 3 Jun 2011 17:08:14 -0400 Subject: [PATCH 3/6] Bump version to 2.0.12-stable. Not release just yet --- Makefile.am | 5 +++-- WIN32-Code/event2/event-config.h | 4 ++-- configure.in | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5538caf2..bf3ae500 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,7 @@ RELEASE = -release 2.0 # # Once an RC is out, DO NOT MAKE ANY ABI-BREAKING CHANGES IN THAT SERIES # UNLESS YOU REALLY REALLY HAVE TO. -VERSION_INFO = 6:0:1 +VERSION_INFO = 6:1:1 # History: RELEASE VERSION_INFO # 2.0.1-alpha -- 2.0 1:0:0 @@ -44,8 +44,9 @@ VERSION_INFO = 6:0:1 # 2.0.7-rc -- 2.0 3:0:1 # 2.0.8-rc -- 2.0 4:0:2 # 2.0.9-rc -- 2.0 5:0:0 (ABI changed slightly) -# Planned: # 2.0.10-stable-- 2.0 5:1:0 (No ABI change) +# 2.0.11-stable-- 2.0 6:0:1 (ABI changed, backward-compatible) +# 2.0.12-stable-- 2.0 6:1:1 (No ABI change) # # For Libevent 2.1: # 2.1.1-alpha -- 2.1 1:0:0 diff --git a/WIN32-Code/event2/event-config.h b/WIN32-Code/event2/event-config.h index 9bca1b7f..7c022d65 100644 --- a/WIN32-Code/event2/event-config.h +++ b/WIN32-Code/event2/event-config.h @@ -277,7 +277,7 @@ /* #undef _EVENT_HAVE_WORKING_KQUEUE */ /* Numeric representation of the version */ -#define _EVENT_NUMERIC_VERSION 0x02000b01 +#define _EVENT_NUMERIC_VERSION 0x02000c00 /* Name of package */ #define _EVENT_PACKAGE "libevent" @@ -334,7 +334,7 @@ #define _EVENT_TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define _EVENT_VERSION "2.0.11-stable-dev" +#define _EVENT_VERSION "2.0.12-stable" /* Define to appropriate substitue if compiler doesnt have __func__ */ #define _EVENT___func__ __FUNCTION__ diff --git a/configure.in b/configure.in index 8517a0de..5e142c90 100644 --- a/configure.in +++ b/configure.in @@ -5,9 +5,9 @@ AC_INIT(event.c) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE(libevent,2.0.11-stable-dev) +AM_INIT_AUTOMAKE(libevent,2.0.12-stable) AM_CONFIG_HEADER(config.h) -AC_DEFINE(NUMERIC_VERSION, 0x02000b01, [Numeric representation of the version]) +AC_DEFINE(NUMERIC_VERSION, 0x02000c00, [Numeric representation of the version]) dnl Initialize prefix. if test "$prefix" = "NONE"; then From c355583750fb88e72069040234c94529ce872c7c Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 3 Jun 2011 17:08:30 -0400 Subject: [PATCH 4/6] Changelog and new credits for 2.0.12-stable --- ChangeLog | 36 ++++++++++++++++++++++++++++++++++++ README | 5 +++++ 2 files changed, 41 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9caf4064..978ba8e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +Changes in version 2.0.12-stable (?? Jun 2011) +BUGFIXES + o Fix a warn-and-fail bug in kqueue by providing kevent() room to report errors (28317a0) + o Fix an assert-inducing fencepost bug in the select backend (d90149d) + o Fix failing http assertion introducd in commit 0d6622e (0848814 Kevin Ko) + o Fix a bug that prevented us from configuring IPv6 nameservers. (74760f1) + o Prevent size_t overflow in evhttp_htmlescape. (06c51cd Mansour Moufid) + o Added several checks for under/overflow conditions in evhttp_handle_chunked_read (a279272 Mark Ellzey) + o Added overflow checks in evhttp_read_body and evhttp_get_body (84560fc Mark Ellzey) + +DOCUMENTATION: + o Add missing words to EVLOOP_NONBLOCK documentation (9556a7d) + +BUILD FIXES + o libssl depends on libcrypto, not the other way around. (274dd03 Peter Rosin) + o Libtool brings in the dependencies of libevent_openssl.la automatically (7b819f2 Peter Rosin) + o Use OPENSSL_LIBS in Makefile.am (292092e Sebastian Hahn) + o Move the win32 detection in configure.in (ceb03b9 Sebastian Hahn) + o Correctly detect openssl on windows (6619385 Sebastian Hahn) + o Fix a compile warning with zlib 1.2.4 and 1.2.5 (5786b91 Sebastian Hahn) + o Fix compilation with GCC 2, which had no __builtin_expect (09d39a1 Dave Hart) + o Fix new warnings from GCC 4.6 (06a714f) + o Link with -lshell32 and -ladvapi32 on Win32. (86090ee Peter Rosin) + o Make the tests build when OpenSSL is not available. (07c41be Peter Rosin) + o Bring in the compile script from automake, if needed. (f3c7a4c Peter Rosin) + o MSVC does not provide S_ISDIR, so provide it manually. (70be7d1 Peter Rosin) + o unistd.h and sys/time.h might not exist. (fe93022 Peter Rosin) + o Make sure TINYTEST_LOCAL is defined when building tinytest.c (8fa030c Peter Rosin) + o Fix winsock2.h #include issues with MSVC (3d768dc Peter Rosin) + o Use evutil_gettimeofday instead of relying on the system gettimeofday. (0de87fe Peter Rosin) + o Always use evutil_snprintf, even if OS provides it (d1b2d11 Sebastian Hahn) + o InitializeCriticalSectionAndSpinCount requires _WIN32_WINNT >= 0x0403. (816115a Peter Rosin) + o cygwin: make it possible to build DLLs (d54d3fc) + + + Changes in version 2.0.11-stable (27 Apr 2011) [Autogenerated from the Git log, sorted and cleaned by hand.] BUGFIXES: diff --git a/README b/README index 8044a98c..bed2121a 100644 --- a/README +++ b/README @@ -104,6 +104,8 @@ fixing bugs: Claudio Jeker Evan Jones Phua Keat + Kevin Ko + Brian Koehmstedt Marko Kreen Valery Kyholodov Scott Lamb @@ -122,6 +124,7 @@ fixing bugs: Andrey Matveev Caitlin Mercer Dagobert Michelsen + Mansour Moufid Felix Nawothnig Trond Norbye Linus Nordberg @@ -136,7 +139,9 @@ fixing bugs: Dimitre Piskyulev Pavel Plesov Jon Poland + Robert Ransom Bert JW Regeer + Peter Rosin Hanna Schroeter Ralf Schmitt Mike Smellie From 452a8342f5b615c9ba5a08a3a30fc719a30ad253 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sat, 4 Jun 2011 21:11:09 -0400 Subject: [PATCH 5/6] tweak date on changelog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 978ba8e5..d8dc3b1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 2.0.12-stable (?? Jun 2011) +Changes in version 2.0.12-stable (4 Jun 2011) BUGFIXES o Fix a warn-and-fail bug in kqueue by providing kevent() room to report errors (28317a0) o Fix an assert-inducing fencepost bug in the select backend (d90149d) From 60c1426f2c16ffe1e4e14b4779e335d824f64aee Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sat, 4 Jun 2011 21:36:34 -0400 Subject: [PATCH 6/6] Bump version to 2.0.12-stable-dev --- ChangeLog | 4 ++++ WIN32-Code/event2/event-config.h | 4 ++-- configure.in | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8dc3b1c..87f8db95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Changes in version 2.0.13-stable (?? Jul 2011) + + + Changes in version 2.0.12-stable (4 Jun 2011) BUGFIXES o Fix a warn-and-fail bug in kqueue by providing kevent() room to report errors (28317a0) diff --git a/WIN32-Code/event2/event-config.h b/WIN32-Code/event2/event-config.h index 7c022d65..bcb5aa1a 100644 --- a/WIN32-Code/event2/event-config.h +++ b/WIN32-Code/event2/event-config.h @@ -277,7 +277,7 @@ /* #undef _EVENT_HAVE_WORKING_KQUEUE */ /* Numeric representation of the version */ -#define _EVENT_NUMERIC_VERSION 0x02000c00 +#define _EVENT_NUMERIC_VERSION 0x02000c01 /* Name of package */ #define _EVENT_PACKAGE "libevent" @@ -334,7 +334,7 @@ #define _EVENT_TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define _EVENT_VERSION "2.0.12-stable" +#define _EVENT_VERSION "2.0.12-stable-dev" /* Define to appropriate substitue if compiler doesnt have __func__ */ #define _EVENT___func__ __FUNCTION__ diff --git a/configure.in b/configure.in index 5e142c90..72d487d7 100644 --- a/configure.in +++ b/configure.in @@ -5,9 +5,9 @@ AC_INIT(event.c) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE(libevent,2.0.12-stable) +AM_INIT_AUTOMAKE(libevent,2.0.12-stable-dev) AM_CONFIG_HEADER(config.h) -AC_DEFINE(NUMERIC_VERSION, 0x02000c00, [Numeric representation of the version]) +AC_DEFINE(NUMERIC_VERSION, 0x02000c01, [Numeric representation of the version]) dnl Initialize prefix. if test "$prefix" = "NONE"; then