[Levent-commits] [Libevent/master 1/4] Bump version to 2.0.14-stable

[Nick M. <ni...@us...>]

Author: Nick Mathewson <ni...@to...>
Date: Tue, 30 Aug 2011 22:28:02 -0400
Subject: Bump version to 2.0.14-stable
Commit: 85976ddfa4742a7c838139506b3dd8f7fd6c7c05

---
 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 520e739..b0bf32f 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 82e5c08..b19902d 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 8615a7d..9a8de5b 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 55a19ba..4aef72d 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
-- 
1.7.4.1