[RELEASE] released 1.3.1 after resyncing with 1.2.15

Released 1.3.1 with the following changes from 1.2.15 :
   - now, haproxy warns about missing timeout during startup to try to
     eliminate all those buggy configurations.
   - added "Content-Type: text/html" in responses wherever appropriate, as
     suggested by Cameron Simpson.
   - implemented "option ssl-hello-chk" to use SSLv3 CLIENT HELLO messages to
     test server's health
   - implemented "monitor-uri" so that haproxy can reply to a specific URI with
     an "HTTP/1.0 200 OK" response. This is useful to validate multiple proxies
     at once.

diff --git a/CHANGELOG b/CHANGELOG
index c5735df1c24529edbbf7c5fb0341a8d2f9dff1e0..dd75b3298506ed96e43c2a367d0fb1acc9eecca5 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,22 @@
 ChangeLog :
 ===========
 
+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.
+   - added "Content-Type: text/html" in responses wherever appropriate, as
+     suggested by Cameron Simpson.
+   - implemented "option ssl-hello-chk" to use SSLv3 CLIENT HELLO messages to
+     test server's health
+   - implemented "monitor-uri" so that haproxy can reply to a specific URI with
+     an "HTTP/1.0 200 OK" response. This is useful to validate multiple proxies
+     at once.
+
 2006/06/29 : 1.3.0
    - exploded the whole file into multiple .c and .h. No functionnal
-     behaviour is expected at all.
+     difference is expected at all.
+   - fixed a bug by which neither stats nor error messages could be returned if
+     'clitimeout' was missing.
 
 2006/05/21 : 1.2.14
    - new HTML status report with the 'stats' keyword.

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

diff --git a/doc/haproxy-en.txt b/doc/haproxy-en.txt
index ea7180784fd41526b697162dfd642d8c5d22c0b7..c3e288f59c4999f69d47d31d11a1279278d3f6eb 100644 (file)
--- a/doc/haproxy-en.txt
+++ b/doc/haproxy-en.txt
@@ -2,9 +2,9 @@
                                  HAProxy
                             Reference  Manual
                            -------------------
-                              version 1.2.14
+                              version 1.3.1
                               willy tarreau
-                                2006/05/21
+                                2006/07/09
 
 ============
 | Abstract |

diff --git a/doc/haproxy-fr.txt b/doc/haproxy-fr.txt
index 157028abee38c7be6e6200656d7ed0f96d09015b..83279f133fd1c157568265f3dc2bac31875a30eb 100644 (file)
--- a/doc/haproxy-fr.txt
+++ b/doc/haproxy-fr.txt
@@ -2,9 +2,9 @@
                                  HAProxy
                            Manuel de référence
                            -------------------
-                              version 1.2.14
+                              version 1.3.1
                               willy tarreau
-                                2006/05/21
+                                2006/07/09
 
 ================
 | Introduction |

diff --git a/examples/haproxy-small.spec b/examples/haproxy-small.spec
index cde9b942b944cc57ebf5da6478ba6ab9cb9df2ee..aaab391e93aeeed47936db357d317b51004ffb21 100644 (file)
--- 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.2.14
+Version: 1.3.1
 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 Jul 09 2006 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.1
+
 * Wed May 21 2006 Willy Tarreau <willy@w.ods.org>
 - updated to 1.2.14
 

diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 1a97b81495f59ed7c7b36cd85c0069be38ec7e64..d832d8ffac62073b5054c1a01c74034af0a41c35 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.14
+Version: 1.3.1
 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 Jul 09 2006 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.1
+
 * Wed May 21 2006 Willy Tarreau <willy@w.ods.org>
 - updated to 1.2.14
 

diff --git a/include/common/version.h b/include/common/version.h
index 14d68a2d4c73893077852fd33ed53c063d50d246..05c4e60caf931ffc0d61826d658e41f6b5ae9b05 100644 (file)
--- 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.0"
+#define HAPROXY_VERSION "1.3.1"
 #endif
 
 #ifdef CONFIG_HAPROXY_DATE
 #define HAPROXY_DATE    CONFIG_HAPROXY_DATE
 #else
-#define HAPROXY_DATE    "2006/06/26"
+#define HAPROXY_DATE    "2006/07/09"
 #endif
 
 #endif /* _COMMON_VERSION_H */