From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 15 Nov 2018 13:35:18 +0000 (+0100)
Subject: BUG/MINOR: http_fetch: Remove the version part when capturing the request uri
X-Git-Tag: v1.9-dev7~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78337bbbaa27fb647a601032cf5f1a8bbe66193b;p=thirdparty%2Fhaproxy.git

BUG/MINOR: http_fetch: Remove the version part when capturing the request uri

This patch fixes a bug introduced in the commit 6b952c810 ("REORG: http: move
http_get_path() to http.c"). In the reorg, the code responsible to skip the
version to only extract the path in the HTTP request was dropped.

No backport is needed, this only affects 1.9.
---

diff --git a/src/http_fetch.c b/src/http_fetch.c
index 40381ccbc1..142bd35a58 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -1252,9 +1252,13 @@ static int smp_fetch_capture_req_uri(const struct arg *args, struct sample *smp,
 	if (!*ptr)
 		return 0;
 
-	ptr++;  /* skip the space */
+	/* skip the first space and find space after URI */
+	path = ist2(++ptr, 0);
+	while (*ptr != ' ' && *ptr != '\0')
+		ptr++;
+	path.len = ptr - path.ptr;
 
-	path = http_get_path(ist(ptr));
+	path = http_get_path(path);
 	if (!path.ptr)
 		return 0;