Index: server/util_regex.c
===================================================================
--- server/util_regex.c (revision 1874061)
+++ server/util_regex.c (working copy)
@@ -94,6 +94,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_poo
}
/* anything after the current delimiter is flags */
+ ret->flags |= AP_REG_DOLLAR_ENDONLY;
what's going on there?
On Sat, Feb 15, 2020 at 2:43 PM Eric Covener <[email protected]> wrote:
>
> On Sat, Feb 15, 2020 at 2:30 PM Yann Ylavic <[email protected]> wrote:
> >
> > On Sat, Feb 15, 2020 at 7:16 PM <[email protected]> wrote:
> > >
> > > --- httpd/httpd/branches/2.4.x/STATUS (original)
> > > +++ httpd/httpd/branches/2.4.x/STATUS Sat Feb 15 18:16:31 2020
> > > @@ -133,6 +133,8 @@ RELEASE SHOWSTOPPERS:
> > > trunk patch: http://svn.apache.org/viewvc?rev=1873941&view=rev
> > > 2.4.x patch:
> > > http://people.apache.org/~covener/patches/httpd-2.4.x-substitute-nodotall.diff
> > > +1 covener, rpluem, jim, ylavic
> > > + jailletc36: This needs some doc update (RegexDefaultOptions and
> > > certainly somewhere
> > > + for the util_regex.c stuff, but I've not found where
> > > :( ).
> >
> > I wonder if, instead of "exposing" NO_DOTALL, we shouldn't have
> > AP_REG_NO_DEFAULT used internally only.
> > There is already a way to disable DOTALL in RegexDefaultOptions (with
> > -DOTALL), and the internal changes to ap_regcomp() and
> > ap_rxplus_compile() could use AP_REG_NO_DEFAULT instead of
> > AP_REG_NO_DOTALL, avoiding to add more NO_* options later (possibly).
> > For mod_substitute, AP_REG_NO_DEFAULT (besides sensible
> > AP_REG_DOLLAR_ENDONLY) would be set since flags can be set explicitely
> > too.
> >
> > Something like the attached patch (over trunk's r1873941)?
>
> looks better, +1
--
Eric Covener
[email protected]
