diff --git a/CHANGELOG b/CHANGELOG index 56847fd6b..4e066ae31 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,22 @@ ChangeLog : =========== +2007/05/08 : 1.3.10 + - several fixes in ev_sepoll + - fixed some expiration dates on some tasks + - fixed a bug in connection establishment detection due to speculative I/O + - fixed rare bug occuring on TCP with early close (reported by Andy Smith) + - implemented URI hashing algorithm (Guillaume Dallaire) + - implemented SMTP health checks (Peter van Dijk) + - replaced the rbtree with ul2tree from old scheduler project + - new framework for generic ACL support + - added the 'acl' and 'block' keywords to the config language + - added several ACL criteria and matches (IP, port, URI, ...) + - cleaned up and better modularization for some time functions + - fixed list macros + - fixed useless memory allocation in str2net() + - store the original destination address in the session + 2007/04/15 : 1.3.9 - modularized the polling mechanisms and use function pointers instead of macros at many places diff --git a/Makefile b/Makefile index 3f5dfa7a4..35d86056b 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.9 +VERSION := 1.3.10 SUBVERS := -VERDATE := 2007/04/15 +VERDATE := 2007/05/08 endif #### build options diff --git a/Makefile.bsd b/Makefile.bsd index 55c5a5668..a13e9f853 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.9 +VERSION := 1.3.10 # 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 3666a88fd..6d6e8662a 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.9 +VERSION := 1.3.10 # 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 42c626474..7157b3aab 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.9 +Version: 1.3.10 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 +* Tue May 08 2007 Willy Tarreau +- updated to 1.3.10 + * Sun Apr 15 2007 Willy Tarreau - updated to 1.3.9 diff --git a/examples/haproxy.spec b/examples/haproxy.spec index f1e0592d1..1f6aa7dc6 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.9 +Version: 1.3.10 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 +* Tue May 08 2007 Willy Tarreau +- updated to 1.3.10 + * Sun Apr 15 2007 Willy Tarreau - updated to 1.3.9 diff --git a/include/common/version.h b/include/common/version.h index dfc14dca0..05e6ee1be 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.9" +#define HAPROXY_VERSION "1.3.10" #endif #ifdef CONFIG_HAPROXY_DATE #define HAPROXY_DATE CONFIG_HAPROXY_DATE #else -#define HAPROXY_DATE "2007/04/15" +#define HAPROXY_DATE "2007/05/08" #endif #endif /* _COMMON_VERSION_H */