You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2023/03/31 13:26:23 UTC
svn commit: r1908859 - in /httpd/httpd/branches/2.4.x: ./ changes-entries/rewrite-qsd-regression.diff modules/mappers/mod_rewrite.c
Author: covener
Date: Fri Mar 31 13:26:23 2023
New Revision: 1908859
URL: http://svn.apache.org/viewvc?rev=1908859&view=rev
Log:
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
Added:
httpd/httpd/branches/2.4.x/changes-entries/rewrite-qsd-regression.diff
- copied, changed from r1908813, httpd/httpd/trunk/changes-entries/rewrite-qsd-regression.diff
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1908813
Copied: httpd/httpd/branches/2.4.x/changes-entries/rewrite-qsd-regression.diff (from r1908813, httpd/httpd/trunk/changes-entries/rewrite-qsd-regression.diff)
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/changes-entries/rewrite-qsd-regression.diff?p2=httpd/httpd/branches/2.4.x/changes-entries/rewrite-qsd-regression.diff&p1=httpd/httpd/trunk/changes-entries/rewrite-qsd-regression.diff&r1=1908813&r2=1908859&rev=1908859&view=diff
==============================================================================
--- httpd/httpd/trunk/changes-entries/rewrite-qsd-regression.diff (original)
+++ httpd/httpd/branches/2.4.x/changes-entries/rewrite-qsd-regression.diff Fri Mar 31 13:26:23 2023
@@ -1,3 +1,3 @@
*) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
- in a question mark. [Eric Covener]
+ in a question mark. PR66547. [Eric Covener]
Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c?rev=1908859&r1=1908858&r2=1908859&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c Fri Mar 31 13:26:23 2023
@@ -3866,6 +3866,7 @@ static const char *cmd_rewriterule(cmd_p
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, '?')) {