From 85976ddfa4742a7c838139506b3dd8f7fd6c7c05 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 30 Aug 2011 22:28:02 -0400 Subject: [PATCH 1/4] Bump version to 2.0.14-stable --- ChangeLog | 1 + Makefile.am | 3 ++- WIN32-Code/event2/event-config.h | 4 ++-- configure.in | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 520e7397..b0bf32f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ BUGFIXES (bufferevents and evbuffers): o Fix handling of group rate limits under 64 bytes of burst (6d5440e) o Solaris sendfile: correctly detect amount of data sent (643922e Michael Herf) o Make rate limiting work with common_timeout logic (5b18f13) + o clear read watermark on underlying bufferevent when creating filtering bev to fix potentially failing fragmented ssl handshakes (54f7e61 Joachim Bauch) BUGFIXES (IOCP): o IOCP: don't launch reads or writes on an unconnected socket (495c227) diff --git a/Makefile.am b/Makefile.am index 82e5c082..b19902df 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:2:1 +VERSION_INFO = 6:3:1 # History: RELEASE VERSION_INFO # 2.0.1-alpha -- 2.0 1:0:0 @@ -48,6 +48,7 @@ VERSION_INFO = 6:2:1 # 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) # 2.0.13-stable-- 2.0 6:2:1 (No ABI change) +# 2.0.14-stable-- 2.0 6:3: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 8615a7dd..9a8de5b0 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 0x02000d01 +#define _EVENT_NUMERIC_VERSION 0x02000e00 /* 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.13-stable-dev" +#define _EVENT_VERSION "2.0.14-stable" /* Define to appropriate substitue if compiler doesnt have __func__ */ #define _EVENT___func__ __FUNCTION__ diff --git a/configure.in b/configure.in index 55a19bad..4aef72df 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.13-stable-dev) +AM_INIT_AUTOMAKE(libevent,2.0.14-stable) AM_CONFIG_HEADER(config.h) -AC_DEFINE(NUMERIC_VERSION, 0x02000d01, [Numeric representation of the version]) +AC_DEFINE(NUMERIC_VERSION, 0x02000e00, [Numeric representation of the version]) dnl Initialize prefix. if test "$prefix" = "NONE"; then From da90a9be691e89216cc28d769e3585b837d0c885 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 30 Aug 2011 22:35:51 -0400 Subject: [PATCH 2/4] Pick a release date for the changelog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b0bf32f9..1b8a12fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 2.0.14-stable (?? ??? 2011) +Changes in version 2.0.14-stable (31 Aug 2011) BUGFIXES (bufferevents and evbuffers): o Propagate errors on the underlying bufferevent to the user. (4a34394 Joachim Bauch) o Ignore OpenSSL deprecation warnings on OS X (5d1b255 Sebastian Hahn) From ac9f2adb45e12f3f43760995a4ca98349fe0a507 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 31 Aug 2011 00:23:20 -0400 Subject: [PATCH 3/4] Credit new contributors for 2.0.14-stable --- README | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README b/README index 1ca99906..b0235e38 100644 --- a/README +++ b/README @@ -95,6 +95,7 @@ fixing bugs: Mihai Draghicioiu Mark Ellzey Shie Erlich + Leonid Evdokimov Christophe Fillot Alexander von Gernler Artur Grabowski @@ -105,6 +106,7 @@ fixing bugs: Tani Hosokawa Claudio Jeker Evan Jones + George Kadianakis Phua Keat Kevin Ko Brian Koehmstedt @@ -118,6 +120,7 @@ fixing bugs: David Libenzi Yan Lin Moshe Litvin + Mitchell Livingston Hagne Mahre Lubomir Marinov Nick Mathewson From a718b6c31cd476a9188ffa05f6bcf082f4b183fd Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 31 Aug 2011 11:25:11 -0400 Subject: [PATCH 4/4] Increment version to 2.0.14-stable-dev --- ChangeLog | 2 ++ WIN32-Code/event2/event-config.h | 4 ++-- configure.in | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b8a12fd..3e1e6784 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +Changes in version 2.0.15-stable (?? ??? 2011) + Changes in version 2.0.14-stable (31 Aug 2011) BUGFIXES (bufferevents and evbuffers): o Propagate errors on the underlying bufferevent to the user. (4a34394 Joachim Bauch) diff --git a/WIN32-Code/event2/event-config.h b/WIN32-Code/event2/event-config.h index 9a8de5b0..d956d3b7 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 0x02000e00 +#define _EVENT_NUMERIC_VERSION 0x02000e01 /* 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.14-stable" +#define _EVENT_VERSION "2.0.14-stable-dev" /* Define to appropriate substitue if compiler doesnt have __func__ */ #define _EVENT___func__ __FUNCTION__ diff --git a/configure.in b/configure.in index 4aef72df..3de245e5 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.14-stable) +AM_INIT_AUTOMAKE(libevent,2.0.14-stable-dev) AM_CONFIG_HEADER(config.h) -AC_DEFINE(NUMERIC_VERSION, 0x02000e00, [Numeric representation of the version]) +AC_DEFINE(NUMERIC_VERSION, 0x02000e01, [Numeric representation of the version]) dnl Initialize prefix. if test "$prefix" = "NONE"; then