From: willy tarreau <willy@wtap.(none)>
Date: Sat, 15 Apr 2006 19:47:50 +0000 (+0200)
Subject: [VERSION] updated everything to reflect version 1.2.12.
X-Git-Tag: v1.2.12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0d4bbdc8db30ac271097a7ae22052b078be9f19;p=thirdparty%2Fhaproxy.git

[VERSION] updated everything to reflect version 1.2.12.
---

diff --git a/CHANGELOG b/CHANGELOG
index 67e9c56540..af549111da 100644
--- 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 765c1e76f1..71ceeeefd9 100644
--- 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 a9f4ed2767..6e8658b7e9 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.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 cdff36e3d8..14f68a80b6 100644
--- 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 */