haproxy: fix from upstream

 [PATCH 4/4] BUG: config: error in http-response replace-header number

Signed-off-by: Thomas Heil <heil@terminal-consulting.de>

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 7d97e53f21d92fe68ce8d84bf34486bf5b0a475c..a0d8e39c44c5b57296ba52a6e12da6a821d13d1b 100644 (file)
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haproxy
 PKG_VERSION:=1.5.3
-PKG_RELEASE:=03
+PKG_RELEASE:=04
 PKG_SOURCE:=haproxy-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.5/src/
 PKG_MD5SUM:=e999a547d57445d5a5ab7eb6a06df9a1

diff --git a/net/haproxy/patches/0004-BUG-config-error-in-http-response-replace-header-num.patch b/net/haproxy/patches/0004-BUG-config-error-in-http-response-replace-header-num.patch
new file mode 100644 (file)
index 0000000..881336a
--- /dev/null
+++ b/net/haproxy/patches/0004-BUG-config-error-in-http-response-replace-header-num.patch
@@ -0,0 +1,34 @@
+From a772b945d757c25037ac58de64ccc27ceeb4b4a7 Mon Sep 17 00:00:00 2001
+From: Baptiste Assmann <bedis9@gmail.com>
+Date: Fri, 8 Aug 2014 17:29:06 +0200
+Subject: [PATCH 4/4] BUG: config: error in http-response replace-header number
+ of arguments
+
+A couple of typo fixed in 'http-response replace-header':
+- an error when counting the number of arguments
+- a typo in the alert message
+
+This should be backported to 1.5.
+(cherry picked from commit 12cb00b216d67468b7c4bd84abedcb4ecd1a32bc)
+---
+ src/proto_http.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/proto_http.c b/src/proto_http.c
+index b7ed85d..2b75b32 100644
+--- a/src/proto_http.c
++++ b/src/proto_http.c
+@@ -9281,8 +9281,8 @@ struct http_res_rule *parse_http_res_cond(const char **args, const char *file, i
+               cur_arg = 1;
+ 
+               if (!*args[cur_arg] || !*args[cur_arg+1] || !*args[cur_arg+2] ||
+-                  (*args[cur_arg+3] && strcmp(args[cur_arg+2], "if") != 0 && strcmp(args[cur_arg+2], "unless") != 0)) {
+-                      Alert("parsing [%s:%d]: 'http-request %s' expects exactly 3 arguments.\n",
++                  (*args[cur_arg+3] && strcmp(args[cur_arg+3], "if") != 0 && strcmp(args[cur_arg+3], "unless") != 0)) {
++                      Alert("parsing [%s:%d]: 'http-response %s' expects exactly 3 arguments.\n",
+                             file, linenum, args[0]);
+                       goto out_err;
+               }
+-- 
+1.8.5.5
+