diff --git a/CHANGELOG b/CHANGELOG index e09ddaee2..fb7738afb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,16 @@ ChangeLog : =========== +2007/09/05 : 1.3.12.1 + - spec I/O: fix allocations of spec entries for an FD + - ensure we never overflow in chunk_printf() + - improve behaviour with large number of servers per proxy + - add support for "stats refresh " + - stats page: added links for 'refresh' and 'hide down' + - fix backend's weight in the stats page. + - the "stats" keyword is not allowed in a pure frontend. + - provide a test configuration file for stats and checks + 2007/06/17 : 1.3.12 - fix segfault at exit when using captures - bug: negation in ACL conds was not cleared between terms diff --git a/Makefile b/Makefile index 39fa4d55d..491310d54 100644 --- a/Makefile +++ b/Makefile @@ -120,9 +120,9 @@ 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.12 +VERSION := 1.3.12.1 SUBVERS := -VERDATE := 2007/06/17 +VERDATE := 2007/09/05 endif #### build options diff --git a/Makefile.bsd b/Makefile.bsd index 14e70f463..1a47b6041 100644 --- a/Makefile.bsd +++ b/Makefile.bsd @@ -2,7 +2,7 @@ # You should use it this way : # make TARGET=os CPU=cpu -VERSION := 1.3.12 +VERSION := 1.3.12.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 0a2aa7436..668f83884 100644 --- a/Makefile.osx +++ b/Makefile.osx @@ -2,7 +2,7 @@ # You should use it this way : # make TARGET=os CPU=cpu -VERSION := 1.3.12 +VERSION := 1.3.12.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 08c859532..c856d9979 100644 --- 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.12 +Version: 1.3.12.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 +* Wed Sep 05 2007 Willy Tarreau +- updated to 1.3.12.1 + * Sun Jun 17 2007 Willy Tarreau - updated to 1.3.12 diff --git a/examples/haproxy.spec b/examples/haproxy.spec index 85c96fc0a..0c8a8043b 100644 --- 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.12 +Version: 1.3.12.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 +* Wed Sep 05 2007 Willy Tarreau +- updated to 1.3.12.1 + * Sun Jun 17 2007 Willy Tarreau - updated to 1.3.12 diff --git a/include/common/version.h b/include/common/version.h index 8022244ba..9bea28dfa 100644 --- a/include/common/version.h +++ b/include/common/version.h @@ -57,13 +57,13 @@ #ifdef CONFIG_HAPROXY_VERSION #define HAPROXY_VERSION CONFIG_HAPROXY_VERSION #else -#define HAPROXY_VERSION "1.3.12" +#define HAPROXY_VERSION "1.3.12.1" #endif #ifdef CONFIG_HAPROXY_DATE #define HAPROXY_DATE CONFIG_HAPROXY_DATE #else -#define HAPROXY_DATE "2007/06/17" +#define HAPROXY_DATE "2007/09/05" #endif #endif /* _COMMON_VERSION_H */