summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG6
-rw-r--r--Makefile2
-rw-r--r--haproxy.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e9d07910f..93aad4e5f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
ChangeLog :
===========
+2006/05/14 : 1.2.13.1
+ - an uninitialized field in the struct session could cause a crash when
+ the session was freed. This has been encountered on Solaris only.
+ - Solaris and OpenBSD no not support shutdown() on listening socket. Let's
+ be nice to them by performing a soft stop if pause fails.
+
2006/05/13 : 1.2.13
- 'maxconn' server parameter to do per-server session limitation
- queueing to support non-blocking session limitation
diff --git a/Makefile b/Makefile
index 40f135fe6..63e2316db 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
# You should use it this way :
# make TARGET=os CPU=cpu
-VERSION := 1.2.13
+VERSION := 1.2.13.1
# Select target OS. TARGET must match a system for which COPTS and LIBS are
# correctly defined below.
diff --git a/haproxy.c b/haproxy.c
index 2372c6b0b..b09ae3c62 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -89,11 +89,11 @@
#include "include/mini-clist.h"
#ifndef HAPROXY_VERSION
-#define HAPROXY_VERSION "1.2.13"
+#define HAPROXY_VERSION "1.2.13.1"
#endif
#ifndef HAPROXY_DATE
-#define HAPROXY_DATE "2006/05/13"
+#define HAPROXY_DATE "2006/05/14"
#endif
/* this is for libc5 for example */