[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.

diff --git a/src/proto_http.c b/src/proto_http.c
index e06ebe68d297fc3e2ecd91866569be80b8390b65..75dd62a9450da488b15aa92b841a57a3dec7433e 100644 (file)
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -681,8 +681,11 @@ void perform_http_redirect(struct session *s, struct stream_interface *si)
        if (rdr.len + s->srv->rdr_len > rdr.size)
                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;