Changeset 36945


Ignore:
Timestamp:
2013-06-17T15:53:49+02:00 (5 years ago)
Author:
heil
Message:

package: haproxy

  • fix a possible crash when using negative header occurrences
Location:
packages/net/haproxy
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/haproxy/Makefile

    r36551 r36945  
    1010 
    1111PKG_NAME:=haproxy 
    12 PKG_VERSION:=1.4.23 
    13 PKG_RELEASE:=04 
     12PKG_VERSION:=1.4.24 
     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:=6535d5e58037ada4b58b439cebe03c79 
     17PKG_MD5SUM:=86422620faa9759907563d5e0524b98c 
    1818 
    1919include $(INCLUDE_DIR)/package.mk 
  • packages/net/haproxy/patches/001-haproxy-1.4.x-sendproxy.patch

    r36337 r36945  
     1From af2038557a14bf6e2915bed545e216a0f1a95fc5 Mon Sep 17 00:00:00 2001 
     2From: =?UTF-8?q?Cyril=20Bont=C3=A9?= <cyril.bonte@free.fr> 
     3Date: Mon, 15 Apr 2013 22:05:00 +0200 
     4Subject: [PATCH] Proxy Protocol based on haproxy 1.4.23 
     5 
     6--- 
     7 doc/configuration.txt     |  26 ++++++- 
     8 include/common/standard.h |  25 ++++++- 
     9 include/proto/client.h    |   1 + 
     10 include/types/buffers.h   |  20 ++--- 
     11 include/types/protocols.h |   1 + 
     12 src/cfgparse.c            |  15 +++- 
     13 src/client.c              | 186 ++++++++++++++++++++++++++++++++++++++++++++++ 
     14 src/proto_http.c          |   4 +- 
     15 src/session.c             |   7 ++ 
     16 src/standard.c            |   9 ++- 
     17 10 files changed, 275 insertions(+), 19 deletions(-) 
     18 
    119--- a/doc/configuration.txt 
    220+++ b/doc/configuration.txt 
     
    94112 extern unsigned int str2uic(const char *s); 
    95113 extern unsigned int strl2ui(const char *s, int len); 
    96 @@ -276,6 +298,7 @@ extern unsigned int strl2uic(const char  
     114@@ -276,9 +298,10 @@ extern unsigned int strl2uic(const char  
    97115 extern int strl2ic(const char *s, int len); 
    98116 extern int strl2irc(const char *s, int len, int *ret); 
     
    101119 unsigned int inetaddr_host(const char *text); 
    102120 unsigned int inetaddr_host_lim(const char *text, const char *stop); 
    103  unsigned int inetaddr_host_lim_ret(const char *text, char *stop, const char **ret); 
     121-unsigned int inetaddr_host_lim_ret(const char *text, char *stop, const char **ret); 
     122+unsigned int inetaddr_host_lim_ret(char *text, char *stop, char **ret); 
     123  
     124 static inline char *cut_crlf(char *s) { 
     125  
    104126--- a/include/proto/client.h 
    105127+++ b/include/proto/client.h 
     
    403425  
    404426        http_silent_debug(__LINE__, s); 
    405 @@ -7739,7 +7740,6 @@ void http_reset_txn(struct session *s) 
     427@@ -7741,7 +7742,6 @@ void http_reset_txn(struct session *s) 
    406428        http_init_txn(s); 
    407429  
     
    413435--- a/src/session.c 
    414436+++ b/src/session.c 
    415 @@ -1071,6 +1071,12 @@ resync_stream_interface: 
     437@@ -34,6 +34,7 @@ 
     438 #include <proto/proxy.h> 
     439 #include <proto/queue.h> 
     440 #include <proto/server.h> 
     441+#include <proto/client.h> 
     442 #include <proto/stick_table.h> 
     443 #include <proto/stream_interface.h> 
     444 #include <proto/stream_sock.h> 
     445@@ -1071,6 +1072,12 @@ resync_stream_interface: 
    416446                        while (ana_list && max_loops--) { 
    417447                                /* Warning! ensure that analysers are always placed in ascending order! */ 
     
    440470  * It returns the value of the number composed of all valid digits read, 
    441471  * and can process negative numbers too. 
     472@@ -993,12 +998,12 @@ unsigned int inetaddr_host_lim(const cha 
     473  * Idem except the pointer to first unparsed byte is returned into <ret> which 
     474  * must not be NULL. 
     475  */ 
     476-unsigned int inetaddr_host_lim_ret(const char *text, char *stop, const char **ret) 
     477+unsigned int inetaddr_host_lim_ret(char *text, char *stop, char **ret) 
     478 { 
     479        const unsigned int ascii_zero = ('0' << 24) | ('0' << 16) | ('0' << 8) | '0'; 
     480        register unsigned int dig100, dig10, dig1; 
     481        int s; 
     482-       const char *p, *d; 
     483+       char *p, *d; 
     484  
     485        dig1 = dig10 = dig100 = ascii_zero; 
     486        s = 24; 
Note: See TracChangeset for help on using the changeset viewer.