Changeset 40562


Ignore:
Timestamp:
2014-04-23T13:42:46+02:00 (4 years ago)
Author:
heil
Message:

package: haproxy update to 1.4.25

Location:
packages/net/haproxy
Files:
10 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/haproxy/Makefile

    r40259 r40562  
    1010 
    1111PKG_NAME:=haproxy 
    12 PKG_VERSION:=1.4.24 
    13 PKG_RELEASE:=11 
     12PKG_VERSION:=1.4.25 
     13PKG_RELEASE:=01 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1616PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.4/src 
    17 PKG_MD5SUM:=86422620faa9759907563d5e0524b98c 
     17PKG_MD5SUM:=74b5ec1f0f9b4d148c8083bcfb512ccd 
    1818 
    1919include $(INCLUDE_DIR)/package.mk 
  • packages/net/haproxy/patches/001-haproxy-1.4.x-sendproxy.patch

    r36945 r40562  
    1717 10 files changed, 275 insertions(+), 19 deletions(-) 
    1818 
    19 --- a/doc/configuration.txt 
    20 +++ b/doc/configuration.txt 
     19Index: haproxy-1.4.25/doc/configuration.txt 
     20=================================================================== 
     21--- haproxy-1.4.25.orig/doc/configuration.txt 
     22+++ haproxy-1.4.25/doc/configuration.txt 
    2123@@ -1343,6 +1343,7 @@ bind [<address>]:<port_range> [, ...] tr 
    2224 bind [<address>]:<port_range> [, ...] id <id> 
     
    5961  
    6062 bind-process [ all | odd | even | <number 1-32> ] ... 
    61 @@ -7237,7 +7253,9 @@ marked with a star ('*') after the field 
     63@@ -7257,7 +7273,9 @@ marked with a star ('*') after the field 
    6264  
    6365 Detailed fields description : 
     
    7072   - "client_port" is the TCP port of the client which initiated the connection. 
    7173  
    72 @@ -7410,7 +7428,9 @@ with a star ('*') after the field name b 
     74@@ -7430,7 +7448,9 @@ with a star ('*') after the field name b 
    7375  
    7476 Detailed fields description : 
     
    8183   - "client_port" is the TCP port of the client which initiated the connection. 
    8284  
    83 --- a/include/common/standard.h 
    84 +++ b/include/common/standard.h 
     85Index: haproxy-1.4.25/include/common/standard.h 
     86=================================================================== 
     87--- haproxy-1.4.25.orig/include/common/standard.h 
     88+++ haproxy-1.4.25/include/common/standard.h 
    8589@@ -269,6 +269,28 @@ static inline unsigned int __strl2uic(co 
    8690        return i; 
     
    124128 static inline char *cut_crlf(char *s) { 
    125129  
    126 --- a/include/proto/client.h 
    127 +++ b/include/proto/client.h 
     130Index: haproxy-1.4.25/include/proto/client.h 
     131=================================================================== 
     132--- haproxy-1.4.25.orig/include/proto/client.h 
     133+++ haproxy-1.4.25/include/proto/client.h 
    128134@@ -25,6 +25,7 @@ 
    129135 #include <common/config.h> 
     
    134140 int event_accept(int fd); 
    135141  
    136 --- a/include/types/buffers.h 
    137 +++ b/include/types/buffers.h 
     142Index: haproxy-1.4.25/include/types/buffers.h 
     143=================================================================== 
     144--- haproxy-1.4.25.orig/include/types/buffers.h 
     145+++ haproxy-1.4.25/include/types/buffers.h 
    138146@@ -135,16 +135,16 @@ 
    139147  * The field is blanked by buffer_init() and only by analysers themselves 
     
    163171 #define AN_REQ_HTTP_XFER_BODY   0x00000800  /* forward request body */ 
    164172  
    165 --- a/include/types/protocols.h 
    166 +++ b/include/types/protocols.h 
     173Index: haproxy-1.4.25/include/types/protocols.h 
     174=================================================================== 
     175--- haproxy-1.4.25.orig/include/types/protocols.h 
     176+++ haproxy-1.4.25/include/types/protocols.h 
    167177@@ -72,6 +72,7 @@ 
    168178 #define LI_O_FOREIGN   0x0002  /* permit listening on foreing addresses */ 
     
    173183 /* The listener will be directly referenced by the fdtab[] which holds its 
    174184  * socket. The listener provides the protocol-specific accept() function to 
    175 --- a/src/cfgparse.c 
    176 +++ b/src/cfgparse.c 
     185Index: haproxy-1.4.25/src/cfgparse.c 
     186=================================================================== 
     187--- haproxy-1.4.25.orig/src/cfgparse.c 
     188+++ haproxy-1.4.25/src/cfgparse.c 
    177189@@ -1467,6 +1467,16 @@ int cfg_parse_listen(const char *file, i 
    178190 #endif 
     
    201213                        err_code |= ERR_ALERT | ERR_FATAL; 
    202214                        goto out; 
    203 @@ -5726,6 +5736,9 @@ out_uri_auth_compat: 
     215@@ -5743,6 +5753,9 @@ out_uri_auth_compat: 
    204216                        listener->handler = process_session; 
    205217                        listener->analysers |= curproxy->fe_req_ana; 
     
    211223                        if ((curproxy->options2 & PR_O2_SMARTACC) || 
    212224                            (curproxy->mode == PR_MODE_HTTP && 
    213 --- a/src/client.c 
    214 +++ b/src/client.c 
     225Index: haproxy-1.4.25/src/client.c 
     226=================================================================== 
     227--- haproxy-1.4.25.orig/src/client.c 
     228+++ haproxy-1.4.25/src/client.c 
    215229@@ -22,6 +22,7 @@ 
    216230  
     
    413427  * SN_FRT_ADDR_SET flag. 
    414428  */ 
    415 --- a/src/proto_http.c 
    416 +++ b/src/proto_http.c 
    417 @@ -4156,7 +4156,8 @@ void http_end_txn_clean_session(struct s 
     429Index: haproxy-1.4.25/src/proto_http.c 
     430=================================================================== 
     431--- haproxy-1.4.25.orig/src/proto_http.c 
     432+++ haproxy-1.4.25/src/proto_http.c 
     433@@ -4209,7 +4209,8 @@ void http_end_txn_clean_session(struct s 
    418434        if (s->rep->lr >= s->rep->data + s->rep->size) 
    419435                s->rep->lr -= s->req->size; 
     
    425441  
    426442        http_silent_debug(__LINE__, s); 
    427 @@ -7741,7 +7742,6 @@ void http_reset_txn(struct session *s) 
     443@@ -7807,7 +7808,6 @@ void http_reset_txn(struct session *s) 
    428444        http_init_txn(s); 
    429445  
     
    433449        s->srv = s->prev_srv = s->srv_conn = NULL; 
    434450        /* re-init store persistence */ 
    435 --- a/src/session.c 
    436 +++ b/src/session.c 
     451Index: haproxy-1.4.25/src/session.c 
     452=================================================================== 
     453--- haproxy-1.4.25.orig/src/session.c 
     454+++ haproxy-1.4.25/src/session.c 
    437455@@ -34,6 +34,7 @@ 
    438456 #include <proto/proxy.h> 
     
    443461 #include <proto/stream_interface.h> 
    444462 #include <proto/stream_sock.h> 
    445 @@ -1071,6 +1072,12 @@ resync_stream_interface: 
     463@@ -1083,6 +1084,12 @@ resync_stream_interface: 
    446464                        while (ana_list && max_loops--) { 
    447465                                /* Warning! ensure that analysers are always placed in ascending order! */ 
     
    456474                                        if (!tcp_inspect_request(s, s->req, AN_REQ_INSPECT)) 
    457475                                                break; 
    458 --- a/src/standard.c 
    459 +++ b/src/standard.c 
     476Index: haproxy-1.4.25/src/standard.c 
     477=================================================================== 
     478--- haproxy-1.4.25.orig/src/standard.c 
     479+++ haproxy-1.4.25/src/standard.c 
    460480@@ -569,6 +569,11 @@ unsigned int strl2uic(const char *s, int 
    461481        return __strl2uic(s, len); 
Note: See TracChangeset for help on using the changeset viewer.