From: Sagi Bashari <sagi@myheritage.com>
Date: Sat, 8 Oct 2011 20:48:48 +0000 (+0200)
Subject: BUG/MINOR: fix options forwardfor if-none when an alternative header name is specified
X-Git-Tag: v1.5-dev8~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1611e2d4a199c12ed5ff8d43b182f117863fcb78;p=thirdparty%2Fhaproxy.git

BUG/MINOR: fix options forwardfor if-none when an alternative header name is specified
---

diff --git a/src/proto_http.c b/src/proto_http.c
index 3ae46bce63..fd298b7816 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -3544,7 +3544,7 @@ int http_process_request(struct session *s, struct buffer *req, int an_bit)
 		struct hdr_ctx ctx = { .idx = 0 };
 
 		if (!((s->fe->options | s->be->options) & PR_O_FF_ALWAYS) &&
-		    http_find_header2("X-Forwarded-For", 15, txn->req.sol, &txn->hdr_idx, &ctx)) {
+		    http_find_header2(s->be->fwdfor_hdr_name, s->be->fwdfor_hdr_len, txn->req.sol, &txn->hdr_idx, &ctx)) {
 			/* The header is set to be added only if none is present
 			 * and we found it, so don't do anything.
 			 */