Backport recent rewrite trunk features

https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/348.diff

Submitted by: covener
Reviewed by: covener, ylavic, rpluem

Github: closes #348

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908859 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/changes-entries/rewrite-qsd-regression.diff b/changes-entries/rewrite-qsd-regression.diff
new file mode 100644 (file)
index 0000000..ffba2ba
--- /dev/null
+++ b/changes-entries/rewrite-qsd-regression.diff
@@ -0,0 +1,3 @@
+  *) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
+     in a question mark. PR66547. [Eric Covener]
+

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 709ffc5289c0e90997311a9377ddc6e0d7794e3a..f93f23f04f9e3cf5ba1e83770be7b0ba6d69d25c 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -3866,6 +3866,7 @@ static const char *cmd_rewriterule(cmd_parms *cmd, void *in_dconf,
     if (*(a2_end-1) == '?') {
         /* a literal ? at the end of the unsubstituted rewrite rule */
         newrule->flags |= RULEFLAG_QSNONE;
+        *(a2_end-1) = '\0'; /* trailing ? has done its job */
     }
     else if (newrule->flags & RULEFLAG_QSDISCARD) {
         if (NULL == ap_strchr(newrule->output, '?')) {