diff --git a/CHANGELOG b/CHANGELOG index dd75b3298..e80b28d39 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,11 @@ ChangeLog : =========== +2006/09/03 : 1.3.2 + - started the changes towards I/O completion callbacks. stream_sock* have + replaced event_*. + - added the new "reqtarpit" and "reqitarpit" protection features + 2006/07/09 : 1.3.1 (1.2.15) - now, haproxy warns about missing timeout during startup to try to eliminate all those buggy configurations. diff --git a/Makefile b/Makefile index b89f4916d..95e76cd7e 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # You should use it this way : # make TARGET=os CPU=cpu -VERSION := 1.3.1 +VERSION := 1.3.2 # 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 aaab391e9..7e02f0e70 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.1 +Version: 1.3.2 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 03 2006 Willy Tarreau +- updated to 1.3.2 + * Wed Jul 09 2006 Willy Tarreau - updated to 1.3.1 diff --git a/examples/haproxy.spec b/examples/haproxy.spec index d832d8ffa..32bb46103 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.1 +Version: 1.3.2 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 03 2006 Willy Tarreau +- updated to 1.3.2 + * Wed Jul 09 2006 Willy Tarreau - updated to 1.3.1 diff --git a/include/common/version.h b/include/common/version.h index 05c4e60ca..0d326d45a 100644 --- a/include/common/version.h +++ b/include/common/version.h @@ -33,13 +33,13 @@ #ifdef CONFIG_HAPROXY_VERSION #define HAPROXY_VERSION CONFIG_HAPROXY_VERSION #else -#define HAPROXY_VERSION "1.3.1" +#define HAPROXY_VERSION "1.3.2" #endif #ifdef CONFIG_HAPROXY_DATE #define HAPROXY_DATE CONFIG_HAPROXY_DATE #else -#define HAPROXY_DATE "2006/07/09" +#define HAPROXY_DATE "2006/09/03" #endif #endif /* _COMMON_VERSION_H */