On Sun, Feb 16, 2020 at 7:57 PM Eric Covener <[email protected]> wrote: > > On Sat, Feb 15, 2020 at 3:48 PM Yann Ylavic <[email protected]> wrote: > > > > On Sat, Feb 15, 2020 at 9:01 PM Eric Covener <[email protected]> wrote: > > > > > > 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? > > > > I assumed we'd still always want DOLLAR_ENDONLY (which otherwise is > > unset by NO_DEFAULT). > > It's a sensible default/hardcoding IMHO, MULTILINE is possibly what > > users want to match '$' before an end-of-line (note that > > DOLLAR_ENDONLY is ignored when MULTILINE is set). > > LGTM. I am confused every time about the ap_rxplus interface on top.
Finally (in r1874090), for ap_rxplus_compile() and mod_substitute I used: AP_REG_NO_DEFAULT | (ap_regcomp_get_default_cflags() & AP_REG_DOLLAR_ENDONLY) to set AP_REG_DOLLAR_ENDONLY only if it's not globally disabled by RegexDefaultOptions. Thanks, Yann.
