[RELEASE] Released version 1.3.11.1 with the following main changes :

    - fixed ev_kqueue which was forgotten during the switch to timeval
    - allowed null timeouts for past events in select

diff --git a/CHANGELOG b/CHANGELOG
index c51d8da33bf27937fea0f3b2acbbac96e58b08fd..723fce41085bfca64a93040f7d3890c98314f743 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 ChangeLog :
 ===========
 
+2007/05/14 : 1.3.11.1
+    - fixed ev_kqueue which was forgotten during the switch to timeval
+    - allowed null timeouts for past events in select
+
 2007/05/14 : 1.3.11
     - fixed ev_sepoll again by rewriting the state machine
     - switched all timeouts to timevals instead of milliseconds

diff --git a/Makefile b/Makefile
index 37a8684f6c7bb87af9558916f933945b7c33c3e9..60b9f134e6ea63571e06062d764ec745b2cff4ac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,7 @@ VERDATE := $(shell date +%Y/%m/%d -d "`git-log HEAD^.. 2>/dev/null | grep -m 1 ^
 else
 # Otherwise, use the hard-coded version of last tag, number of changes
 # since last tag, and release date.
-VERSION := 1.3.11
+VERSION := 1.3.11.1
 SUBVERS := 
 VERDATE := 2007/05/14
 endif

diff --git a/Makefile.bsd b/Makefile.bsd
index 2d752436104b6382dd24eec788a22a7e7b84a68e..56c480f6674efce93d0577a28ae3d91282f1f313 100644 (file)
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -2,7 +2,7 @@
 # You should use it this way :
 #   make TARGET=os CPU=cpu
 
-VERSION := 1.3.11
+VERSION := 1.3.11.1
 
 # Select target OS. TARGET must match a system for which COPTS and LIBS are
 # correctly defined below.

diff --git a/Makefile.osx b/Makefile.osx
index 7dfc861e1acae67e23cd5252682350083bd37147..c739278dba8727e01d9b49cbf3f2fdf797215537 100644 (file)
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -2,7 +2,7 @@
 # You should use it this way :
 #   make TARGET=os CPU=cpu
 
-VERSION := 1.3.11
+VERSION := 1.3.11.1
 
 # Select target OS. TARGET must match a system for which COPTS and LIBS are
 # correctly defined below.

diff --git a/examples/haproxy-small.spec b/examples/haproxy-small.spec
index ae29e9c55d22c023b18326f8774ecafa16579c80..f40198061f40b6893629c48a1f1cb28fa8384793 100644 (file)
--- a/examples/haproxy-small.spec
+++ b/examples/haproxy-small.spec
@@ -1,6 +1,6 @@
 Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 Name: haproxy
-Version: 1.3.11
+Version: 1.3.11.1
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -69,6 +69,9 @@ fi
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Mon May 14 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.11.1
+
 * Mon May 14 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.11
 

diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 8f8fe827c711f9b36f20129ca137f54e7527babf..b37703bdd24bd186a98b1d4d783b1e574167c557 100644 (file)
--- a/examples/haproxy.spec
+++ b/examples/haproxy.spec
@@ -1,6 +1,6 @@
 Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 Name: haproxy
-Version: 1.3.11
+Version: 1.3.11.1
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -71,6 +71,9 @@ fi
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Mon May 14 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.11.1
+
 * Mon May 14 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.11
 

diff --git a/include/common/version.h b/include/common/version.h
index 6b4280b586297684f1c1ef2e11c3f4c78268171d..244b1f38f2a886afaa10f21f2d8403e4a67f509f 100644 (file)
--- a/include/common/version.h
+++ b/include/common/version.h
@@ -57,7 +57,7 @@
 #ifdef CONFIG_HAPROXY_VERSION
 #define HAPROXY_VERSION CONFIG_HAPROXY_VERSION
 #else
-#define HAPROXY_VERSION "1.3.11"
+#define HAPROXY_VERSION "1.3.11.1"
 #endif
 
 #ifdef CONFIG_HAPROXY_DATE