[VERSION] updated everything to reflect version 1.2.12.

diff --git a/CHANGELOG b/CHANGELOG
index 67e9c565405cc011a9fb1d935c06a1aea750f144..af549111da94f49b2158fbf060e77af38f779a09 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,14 @@
 ChangeLog :
 ===========
 
+2006/04/15 : 1.2.12
+   Very few changes preparing for more important changes to support per-server
+   session limitations and queueing :
+   - ignore leading empty lines in HTTP requests as suggested by RFC2616.
+   - added the 'weight' parameter to the servers, limited to 1..256. It applies
+     to roundrobin and source hash.
+   - the optional '-s' option could clobber '-st' and '-sf' if compiled in.
+
 2006/03/30 : 1.2.11.1
    - under some conditions, it might have been possible that when the
      last dead server became available, it would not have been used

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

diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index a9f4ed2767e31833ba764761b5c4c2aab28a2450..6e8658b7e96c13ecdb4254b44b669fa1813e064e 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.2.11.1
+Version: 1.2.12
 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 Apr 15 2006 Willy Tarreau <willy@w.ods.org>
+- updated to 1.2.12
+
 * Wed Mar 30 2006 Willy Tarreau <willy@w.ods.org>
 - updated to 1.2.11.1
 

diff --git a/haproxy.c b/haproxy.c
index cdff36e3d82f8057890fd350099762ffbe532f29..14f68a80b6f2d750f3ab262884c6c95ab13b9feb 100644 (file)
--- a/haproxy.c
+++ b/haproxy.c
@@ -88,11 +88,11 @@
 #include "include/appsession.h"
 
 #ifndef HAPROXY_VERSION
-#define HAPROXY_VERSION "1.2.11.1"
+#define HAPROXY_VERSION "1.2.12"
 #endif
 
 #ifndef HAPROXY_DATE
-#define HAPROXY_DATE   "2006/03/30"
+#define HAPROXY_DATE   "2006/04/15"
 #endif
 
 /* this is for libc5 for example */