From: Ruediger Pluem <rpluem@apache.org>
Date: Tue, 25 Dec 2007 09:35:05 +0000 (+0000)
Subject: * Revert to old behaviour: Even if we detect a bad character: Formally decode
X-Git-Tag: 2.3.0~1101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6654f2f657718853d9e1ca9050d9675c05f73555;p=thirdparty%2Fapache%2Fhttpd.git

* Revert to old behaviour: Even if we detect a bad character: Formally decode
  string correctly and do not mess up the string. Let the caller decide what
  it wants to do with the result according to our return code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606776 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/util.c b/server/util.c
index df806aa384a..eede0053085 100644
--- a/server/util.c
+++ b/server/util.c
@@ -1578,6 +1578,8 @@ static int unescape_url(char *url, const char *forbid, const char *reserved)
                 if ((decoded == '\0')
                     || (forbid && ap_strchr_c(forbid, decoded))) {
                     badpath = 1;
+                    *x = decoded;
+                    y += 2;
                 }
                 else if (reserved && ap_strchr_c(reserved, decoded)) {
                     *x++ = *y++;