Use decoded url for matching in mod_redirect (#1720)

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2309 152afb58-edef-0310-8abb-c4023f1b3aa9

NEWS

@@ -64,6 +64,7 @@ NEWS
   * fix auth.backend.ldap.bind-dn/pw problems (only read from global context for temporary ldap reconnects, thx ruskie)
   * fix memleak in request header parsing (#1774, thx qhy)
   * fix mod_rewrite memleak/endless loop detection (#1775, thx phy - again!)
+  * use decoded url for matching in mod_redirect (#1720)
 
 - 1.4.19 - 2008-03-10
 

src/mod_redirect.c

@@ -178,7 +178,11 @@ static handler_t mod_redirect_uri_handler(server *srv, connection *con, void *p_
 
 	mod_redirect_patch_connection(srv, con, p);
 
-	buffer_copy_string_buffer(p->match_buf, con->request.uri);
+	buffer_copy_string_buffer(p->match_buf, con->uri.path);
+	if (con->uri.query->used > 0) {
+		buffer_append_string_len(p->match_buf, CONST_STR_LEN("?"));
+		buffer_append_string_buffer(p->match_buf, con->uri.query);
+	}
 
 	for (i = 0; i < p->conf.redirect->used; i++) {
 		pcre *match;