Released 1.2.10.1

diff --git a/CHANGELOG b/CHANGELOG
index 6122503656dacf9a66ef63b69ececd1c5ed4b5b8..5e5e91e042e2e788b1108d96aceb7589a1515525 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 ChangeLog :
 ===========
 
+2006/03/23 : 1.2.10.1
+  - while fixing the backup server round-robin "feature", a new bug was
+    introduced which could miss some backup servers.
+  - the displayed proxy name was wrong when dumping upon SIGHUP.
+
 2006/03/19 : 1.2.10
   - assert.h is needed when DEBUG is defined.
   - ENORMOUS long standing bug affecting the epoll polling system :

diff --git a/haproxy.c b/haproxy.c
index d03ec1f4e449f495df566eeb6a8ad22f5120b89d..27b834ec1c1aa84f547f658faadcd0d4f27d1eb4 100644 (file)
--- a/haproxy.c
+++ b/haproxy.c
@@ -87,8 +87,13 @@
 
 #include "include/appsession.h"
 
-#define HAPROXY_VERSION "1.2.10"
-#define HAPROXY_DATE   "2006/03/19"
+#ifndef HAPROXY_VERSION
+#define HAPROXY_VERSION "1.2.10.1"
+#endif
+
+#ifndef HAPROXY_DATE
+#define HAPROXY_DATE   "2006/03/23"
+#endif
 
 /* this is for libc5 for example */
 #ifndef TCP_NODELAY