bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package: haproxy

Browse Source 
- update to 1.4.23 
   -  (CVE-2013-1912)
   -  fixup for consistent hash 
   -  refresh accept-proxy patch



git-svn-id: svn://svn.openwrt.org/openwrt/packages@36337 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
heil
2013-04-15 14:38:07 +00:00
parent 238d95974c
commit 58262c6392
46 changed files with 70 additions and 2959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
net/haproxy/patches/001-haproxy-1.4.x-sendproxy.patch
View File

@ -1,6 +1,6 @@
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -1339,6 +1339,7 @@ bind [<address>]:<port_range> [, ...] tr
@@ -1343,6 +1343,7 @@ bind [<address>]:<port_range> [, ...] tr
bind [<address>]:<port_range> [, ...] id <id>
bind [<address>]:<port_range> [, ...] name <name>
bind [<address>]:<port_range> [, ...] defer-accept
@ -8,7 +8,7 @@
Define one or several listening addresses and/or ports in a frontend.
May be used in sections : defaults | frontend | listen | backend
no | yes | yes | no
@@ -1419,6 +1420,19 @@ bind [<address>]:<port_range> [, ...] de
@@ -1423,6 +1424,19 @@ bind [<address>]:<port_range> [, ...] de
with front firewalls which would see an established
connection while the proxy will only see it in SYN_RECV.
@ -28,7 +28,7 @@
It is possible to specify a list of address:port combinations delimited by
commas. The frontend will then listen on all of these addresses. There is no
fixed limit to the number of addresses and ports which can be listened on in
@@ -1429,8 +1443,10 @@ bind [<address>]:<port_range> [, ...] de
@@ -1433,8 +1447,10 @@ bind [<address>]:<port_range> [, ...] de
listen http_proxy
bind :80,:443
bind 10.0.0.1:10080,10.0.0.1:10443
@ -40,7 +40,7 @@
bind-process [ all | odd | even | <number 1-32> ] ...
@@ -7231,7 +7247,9 @@ marked with a star ('*') after the field
@@ -7237,7 +7253,9 @@ marked with a star ('*') after the field
Detailed fields description :
- "client_ip" is the IP address of the client which initiated the TCP
@ -51,7 +51,7 @@
- "client_port" is the TCP port of the client which initiated the connection.
@@ -7404,7 +7422,9 @@ with a star ('*') after the field name b
@@ -7410,7 +7428,9 @@ with a star ('*') after the field name b
Detailed fields description :
- "client_ip" is the IP address of the client which initiated the TCP
@ -178,7 +178,7 @@
file, linenum, args[0]);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
@@ -5732,6 +5742,9 @@ out_uri_auth_compat:
@@ -5726,6 +5736,9 @@ out_uri_auth_compat:
listener->handler = process_session;
listener->analysers |= curproxy->fe_req_ana;
@ -392,7 +392,7 @@
*/
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -4127,7 +4127,8 @@ void http_end_txn_clean_session(struct s
@@ -4156,7 +4156,8 @@ void http_end_txn_clean_session(struct s
if (s->rep->lr >= s->rep->data + s->rep->size)
s->rep->lr -= s->req->size;
@ -402,7 +402,7 @@
s->rep->analysers = 0;
http_silent_debug(__LINE__, s);
@@ -7670,7 +7671,6 @@ void http_reset_txn(struct session *s)
@@ -7739,7 +7740,6 @@ void http_reset_txn(struct session *s)
http_init_txn(s);
s->be = s->fe;
@ -412,7 +412,7 @@
/* re-init store persistence */
--- a/src/session.c
+++ b/src/session.c
@@ -1055,6 +1055,12 @@ resync_stream_interface:
@@ -1071,6 +1071,12 @@ resync_stream_interface:
while (ana_list && max_loops--) {
/* Warning! ensure that analysers are always placed in ascending order! */