diff --git a/include/ap_regex.h b/include/ap_regex.h

index 5122154..349ae83 100644

--- a/include/ap_regex.h

+++ b/include/ap_regex.h

@@ -77,6 +77,8 @@ extern "C" {

 #define AP_REG_NOMEM 0x20    /* nomem in our code */

 #define AP_REG_DOTALL 0x40   /* perl's /s flag */

+#define AP_REG_DOLLAR_ENDONLY 0x200 /**< '$' matches at end of subject string only */

+

 /* Error values: */

 enum {

   AP_REG_ASSERT = 1,  /** internal error ? */

@@ -100,6 +102,26 @@ typedef struct {

 /* The functions */

+/**

+ * Get default compile flags

+ * @return Bitwise OR of AP_REG_* flags

+ */

+AP_DECLARE(int) ap_regcomp_get_default_cflags(void);

+

+/**

+ * Set default compile flags

+ * @param cflags Bitwise OR of AP_REG_* flags

+ */

+AP_DECLARE(void) ap_regcomp_set_default_cflags(int cflags);

+

+/**

+ * Get the AP_REG_* corresponding to the string.

+ * @param name The name (i.e. AP_REG_<name>)

+ * @return The AP_REG_*, or zero if the string is unknown

+ *

+ */

+AP_DECLARE(int) ap_regcomp_default_cflag_by_name(const char *name);

+

 /**

  * Compile a regular expression.

  * @param preg Returned compiled regex

diff --git a/server/core.c b/server/core.c

index b3240a0..e073ddf 100644

--- a/server/core.c

+++ b/server/core.c

@@ -48,6 +48,7 @@

 #include "mod_core.h"

 #include "mod_proxy.h"

 #include "ap_listen.h"

+#include "ap_regex.h"

 #include "mod_so.h" /* for ap_find_loaded_module_symbol */

@@ -2646,6 +2647,58 @@ static const char *virtualhost_section(cmd_parms *cmd, void *dummy,

     return errmsg;

 }

+static const char *set_regex_default_options(cmd_parms *cmd,

+                                             void *dummy,

+                                             const char *arg)

+{

+    const command_rec *thiscmd = cmd->cmd;

+    int cflags, cflag;

+

+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);

+    if (err != NULL) {

+        return err;

+    }

+

+    cflags = ap_regcomp_get_default_cflags();

+    while (*arg) {

+        const char *name = ap_getword_conf(cmd->pool, &arg;;

+        int how = 0;

+

+        if (strcasecmp(name, "none") == 0) {

+            cflags = 0;

+            continue;

+        }

+

+        if (*name == '+') {

+            name++;

+            how = +1;

+        }

+        else if (*name == '-') {

+            name++;

+            how = -1;

+        }

+

+        cflag = ap_regcomp_default_cflag_by_name(name);

+        if (!cflag) {

+            return apr_psprintf(cmd->pool, "%s: option '%s' unknown",

+                                thiscmd->name, name);

+        }

+

+        if (how > 0) {

+            cflags |= cflag;

+        }

+        else if (how < 0) {

+            cflags &= ~cflag;

+        }

+        else {

+            cflags = cflag;

+        }

+    }

+    ap_regcomp_set_default_cflags(cflags);

+

+    return NULL;

+}

+

 static const char *set_server_alias(cmd_parms *cmd, void *dummy,

                                     const char *arg)

 {

@@ -4164,6 +4217,9 @@ AP_INIT_TAKE12("RLimitNPROC", no_set_limit, NULL,

    OR_ALL, "soft/hard limits for max number of processes per uid"),

 #endif

+AP_INIT_RAW_ARGS("RegexDefaultOptions", set_regex_default_options, NULL, RSRC_CONF,

+                 "default options for regexes (prefixed by '+' to add, '-' to del)"),

+

 /* internal recursion stopper */

 AP_INIT_TAKE12("LimitInternalRecursion", set_recursion_limit, NULL, RSRC_CONF,

               "maximum recursion depth of internal redirects and subrequests"),

@@ -4569,6 +4625,8 @@ static int core_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptem

     apr_pool_cleanup_register(pconf, NULL, reset_config_defines,

                               apr_pool_cleanup_null);

+    ap_regcomp_set_default_cflags(AP_REG_DOLLAR_ENDONLY);

+

     mpm_common_pre_config(pconf);

     return OK;

diff --git a/server/util_pcre.c b/server/util_pcre.c

index 1e83cad..d7df400 100644

--- a/server/util_pcre.c

+++ b/server/util_pcre.c

@@ -110,6 +110,38 @@ AP_DECLARE(void) ap_regfree(ap_regex_t *preg)

  *            Compile a regular expression       *

  *************************************************/

+static int default_cflags = AP_REG_DOLLAR_ENDONLY;

+

+AP_DECLARE(int) ap_regcomp_get_default_cflags(void)

+{

+    return default_cflags;

+}

+

+AP_DECLARE(void) ap_regcomp_set_default_cflags(int cflags)

+{

+    default_cflags = cflags;

+}

+

+AP_DECLARE(int) ap_regcomp_default_cflag_by_name(const char *name)

+{

+    int cflag = 0;

+

+    if (strcasecmp(name, "ICASE") == 0) {

+        cflag = AP_REG_ICASE;

+    }

+    else if (strcasecmp(name, "DOTALL") == 0) {

+        cflag = AP_REG_DOTALL;

+    }

+    else if (strcasecmp(name, "DOLLAR_ENDONLY") == 0) {

+        cflag = AP_REG_DOLLAR_ENDONLY;

+    }

+    else if (strcasecmp(name, "EXTENDED") == 0) {

+        cflag = AP_REG_EXTENDED;

+    }

+

+    return cflag;

+}

+

 /*

  * Arguments:

  *  preg        points to a structure for recording the compiled expression

@@ -126,12 +158,16 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t * preg, const char *pattern, int cflags)

     int errcode = 0;

     int options = 0;

+    cflags |= default_cflags;

     if ((cflags & AP_REG_ICASE) != 0)

         options |= PCRE_CASELESS;

     if ((cflags & AP_REG_NEWLINE) != 0)

         options |= PCRE_MULTILINE;

     if ((cflags & AP_REG_DOTALL) != 0)

         options |= PCRE_DOTALL;

+    if ((cflags & AP_REG_DOLLAR_ENDONLY) != 0)

+        options |= PCRE_DOLLAR_ENDONLY;

+

     preg->re_pcre =

         pcre_compile2(pattern, options, &errcode, &errorptr, &erroffset, NULL);