From cd2ae4f3427631488e32519ac67d9ee2a45657c3 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 10 Jan 2010 00:24:22 +0100 Subject: [PATCH] [MINOR] http: fix double slash prefix with server redirect When using server redirection, it is possible to specify a path consisting of only one slash. While this is discouraged (risk of loop) it may sometimes be useful combined with content switching. The prefixing of a '/' then causes two slashes to be returned in the response. So we now do as with the other redirects, don't prepend a slash if it's alone. (cherry picked from commit dcb75c4a83246f4907cdd5ffac9cbd7b71732816) --- src/proto_http.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/proto_http.c b/src/proto_http.c index 421b6c069..e656a29f9 100644 --- a/src/proto_http.c +++ b/src/proto_http.c @@ -651,8 +651,11 @@ void perform_http_redirect(struct session *s, struct stream_interface *si) if (rdr.len + s->srv->rdr_len > sizeof(trash)) return; - memcpy(rdr.str + rdr.len, s->srv->rdr_pfx, s->srv->rdr_len); - rdr.len += s->srv->rdr_len; + /* special prefix "/" means don't change URL */ + if (s->srv->rdr_len != 1 || *s->srv->rdr_pfx != '/') { + memcpy(rdr.str + rdr.len, s->srv->rdr_pfx, s->srv->rdr_len); + rdr.len += s->srv->rdr_len; + } /* 3: add the request URI */ txn = &s->txn;