[MINOR] updated versions and docs
The version was not updated in some files. Also, added a few
example configs.
diff --git a/CHANGELOG b/CHANGELOG
index 8c43179..50d8a37 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,19 @@
ChangeLog :
===========
+2007/01/02 : 1.3.4
+ - support for cttproxy on the server side to present the client
+ address to the server.
+ - added support for SO_REUSEPORT on Linux (needs kernel patch)
+ - new RFC2616-compliant HTTP request parser with header indexing
+ - split proxies in frontends, rulesets and backends
+ - implemented the 'req[i]setbe' to select a backend depending
+ on the contents
+ - added the 'default_backend' keyword to select a default BE.
+ - new stats page featuring FEs and BEs + bytes in both dirs
+ - improved log format to indicate the backend and the time in ms.
+ - lots of cleanups
+
2006/10/15 : 1.3.3
- fix broken redispatch option in case the connection has already
been marked "in progress" (ie: nearly always).
diff --git a/Makefile.bsd b/Makefile.bsd
index b288820..7cde194 100644
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -2,7 +2,7 @@
# You should use it this way :
# make TARGET=os CPU=cpu
-VERSION := 1.3.3
+VERSION := 1.3.4
# Select target OS. TARGET must match a system for which COPTS and LIBS are
# correctly defined below.
diff --git a/doc/stats-v2.txt b/doc/stats-v2.txt
new file mode 100644
index 0000000..7d2ae76
--- /dev/null
+++ b/doc/stats-v2.txt
@@ -0,0 +1,8 @@
+
+ Qcur Qmax Scur Smax Slim Scum Fin Fout Bin Bout Ereq Econ Ersp Sts Wght Act Bck EChk Down
+Frontend - - X maxX Y totX I O I O Q - - - - - - - -
+Server X maxX X maxX Y totX I O I O - C R S W A B E D
+Server X maxX X maxX Y totX I O I O - C R S W A B E D
+Server X maxX X maxX Y totX I O I O - C R S W A B E D
+Backend X maxX X maxX Y totX I O I O - C R S totW totA totB totE totD
+
diff --git a/examples/content-sw-sample.cfg b/examples/content-sw-sample.cfg
new file mode 100644
index 0000000..8eef3ab
--- /dev/null
+++ b/examples/content-sw-sample.cfg
@@ -0,0 +1,75 @@
+#
+# This is a sample configuration
+# haproxy >= 1.3.4 required.
+#
+# It listens on 192.168.1.10:80, and directs all requests for Host 'img' or
+# URIs starting with /img or /css to a dedicated group of servers. URIs
+# starting with /admin/stats are directed to a backend dedicated to statistics.
+#
+
+global
+ maxconn 10000
+ log 127.0.0.1 local0
+ uid 200
+ gid 200
+ chroot /var/empty
+ daemon
+
+
+# The public 'www' address in the DMZ
+frontend public
+ bind 192.168.1.10:80
+ mode http
+ log global
+ option httplog
+ option dontlognull
+ option httpclose
+ monitor-uri /monitoruri
+ maxconn 8000
+ clitimeout 30000
+
+ # Host: will use a specific keyword soon
+ reqisetbe ^Host:\ img static
+
+ # The URI will use a specific keyword soon
+ reqisetbe ^[^\ ]*\ /(img|css)/ static
+ reqisetbe ^[^\ ]*\ /admin/stats stats
+
+ default_backend dynamic
+
+
+# The static backend backend for 'Host: img', /img and /css.
+backend static
+ mode http
+ balance roundrobin
+ contimeout 5000
+ srvtimeout 5000
+ redispatch
+ retries 2
+ option httpchk HEAD /favicon.ico
+ server statsrv1 192.168.1.8:80 check inter 1000
+ server statsrv2 192.168.1.9:80 check inter 1000
+
+
+backend dynamic
+ mode http
+ balance roundrobin
+ contimeout 30000
+ srvtimeout 30000
+ redispatch
+ retries 2
+ option httpchk HEAD /login.php
+ cookie DYNSRV insert indirect nocache
+ fullconn 4000 # the servers will be used at full load above this number of connections
+ server dynsrv1 192.168.1.1:80 minconn 50 maxconn 500 cookie s1 check inter 1000
+ server dynsrv2 192.168.1.2:80 minconn 50 maxconn 500 cookie s2 check inter 1000
+ server dynsrv3 192.168.1.3:80 minconn 50 maxconn 500 cookie s3 check inter 1000
+ server dynsrv4 192.168.1.4:80 minconn 50 maxconn 500 cookie s4 check inter 1000
+
+
+backend stats
+ log global
+ mode http
+ stats uri /
+ balance roundrobin
+
diff --git a/examples/cttproxy-src.cfg b/examples/cttproxy-src.cfg
new file mode 100644
index 0000000..541f431
--- /dev/null
+++ b/examples/cttproxy-src.cfg
@@ -0,0 +1,63 @@
+#
+# test tproxy
+
+#
+# ip a a 2.0.0.1/16 dev eth0
+# ip a a 1.0.0.1/16 dev eth1
+# ip li set eth1 up
+#
+# sudo rmmod -r iptable_tproxy
+# modprobe ip_conntrack hashsize=65536
+# modprobe iptable_tproxy hashsize=65536
+
+
+# or :
+# sudo insmod net/ipv4/netfilter/ip_conntrack.o hashsize=65536;sudo insmod net/ipv4/netfilter/iptable_nat.o;sudo insmod net/ipv4/netfilter/iptable_tproxy.o hashsize=65536
+
+
+# This is a test configuration.
+# It must load-balance across active servers. Check local apache logs to
+# verify :
+#
+# tail /var/log/apache/access_log
+
+
+global
+ maxconn 10000
+
+listen sample1
+ mode http
+ option httplog
+ option dontlognull
+ retries 1
+ redispatch
+ contimeout 5000
+ clitimeout 5000
+ srvtimeout 5000
+ maxconn 40000
+ bind 1.0.0.1:8081
+ balance roundrobin
+ server srv1 10.0.3.2:80 cookie s0 source 10.0.3.1 usesrc 1.0.0.3
+ #server srv1 10.0.3.2:80 cookie s0 source 10.0.3.1 usesrc client
+ #server srv1 10.0.3.2:80 cookie s0 source 127.0.0.1 usesrc clientip
+ #server srv1 10.0.3.2:80 cookie s0 source 10.0.3.1 usesrc client check inter 1000
+ option httpclose
+ #errorloc 503 /503
+
+listen sample1
+ mode http
+ option httplog
+ option dontlognull
+ retries 1
+ redispatch
+ contimeout 5000
+ clitimeout 5000
+ srvtimeout 5000
+ maxconn 40000
+ bind 1.0.0.1:8082
+ balance roundrobin
+ server srv1 10.0.3.2:80 cookie s0 source 10.0.3.1
+ #server srv1 10.0.3.2:80 cookie s0 source 10.0.3.1 usesrc client check inter 1000
+ option httpclose
+ #errorloc 503 /503
+
diff --git a/examples/haproxy-small.spec b/examples/haproxy-small.spec
index f987518..df686fb 100644
--- 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.3.3
+Version: 1.3.4
Release: 1
License: GPL
Group: System Environment/Daemons
@@ -69,6 +69,9 @@
%attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
%changelog
+* Wed Jan 02 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.4
+
* Wed Oct 15 2006 Willy Tarreau <w@1wt.eu>
- updated to 1.3.3
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 16e4220..146c754 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.3.3
+Version: 1.3.4
Release: 1
License: GPL
Group: System Environment/Daemons
@@ -71,6 +71,9 @@
%attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
%changelog
+* Wed Jan 02 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.4
+
* Wed Oct 15 2006 Willy Tarreau <w@1wt.eu>
- updated to 1.3.3
diff --git a/include/common/version.h b/include/common/version.h
index c8fed3d..a86882e 100644
--- a/include/common/version.h
+++ b/include/common/version.h
@@ -57,13 +57,14 @@
#ifdef CONFIG_HAPROXY_VERSION
#define HAPROXY_VERSION CONFIG_HAPROXY_VERSION
#else
-#define HAPROXY_VERSION "1.3.3"
+#define HAPROXY_VERSION "1.3.4"
#endif
#ifdef CONFIG_HAPROXY_DATE
#define HAPROXY_DATE CONFIG_HAPROXY_DATE
#else
-#define HAPROXY_DATE "2006/10/15"
+#define HAPROXY_DATE "2007/01/02"
#endif
#endif /* _COMMON_VERSION_H */
+