From: Jim Jagielski <jim@apache.org>
Date: Mon, 27 Oct 2014 12:44:16 +0000 (+0000)
Subject: Merge r1628924 from trunk:
X-Git-Tag: 2.4.11~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1b336977f926e996c1650817ea1b052f410bbab;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1628924 from trunk:

mod_substitute: Restrict configuration in .htaccess to
FileInfo as documented.

Submitted by: rjung
Reviewed/backported by: jim


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

diff --git a/CHANGES b/CHANGES
index aaf79ae4fee..d2d23b448a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.11
 
+  *) mod_substitute: Restrict configuration in .htaccess to
+     FileInfo as documented.  [Rainer Jung]
+
   *) mod_substitute: Make maximum line length configurable.  [Rainer Jung]
 
   *) mod_substitute: Fix line length limitation in case of regexp plus flatten.
diff --git a/STATUS b/STATUS
index 35b236b8dde..abe30084fdb 100644
--- a/STATUS
+++ b/STATUS
@@ -102,12 +102,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_substitute: Restrict configuration in .htaccess to
-     FileInfo as documented.
-     trunk patch: http://svn.apache.org/r1628924
-     2.4.x patch: trunk works modulo CHANGES
-     +1: rjung, covener, jim
-
    * various: Concat string at compile time when possible.
      trunk patch: http://svn.apache.org/r1626050
      2.4.x patch: trunk works
diff --git a/modules/filters/mod_substitute.c b/modules/filters/mod_substitute.c
index 9cebb916305..c9de4fe949c 100644
--- a/modules/filters/mod_substitute.c
+++ b/modules/filters/mod_substitute.c
@@ -687,9 +687,9 @@ static void register_hooks(apr_pool_t *pool)
 }
 
 static const command_rec substitute_cmds[] = {
-    AP_INIT_TAKE1("Substitute", set_pattern, NULL, OR_ALL,
+    AP_INIT_TAKE1("Substitute", set_pattern, NULL, OR_FILEINFO,
                   "Pattern to filter the response content (s/foo/bar/[inf])"),
-    AP_INIT_TAKE1("SubstituteMaxLineLength", set_max_line_length, NULL, OR_ALL,
+    AP_INIT_TAKE1("SubstituteMaxLineLength", set_max_line_length, NULL, OR_FILEINFO,
                   "Maximum line length"),
     {NULL}
 };