svn commit: r1634524 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/filters/mod_substitute.c

[ji...@apache.org]

Author: jim
Date: Mon Oct 27 12:44:16 2014
New Revision: 1634524

URL: http://svn.apache.org/r1634524
Log:
Merge r1628924 from trunk:

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

Submitted by: rjung
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/filters/mod_substitute.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1628924

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1634524&r1=1634523&r2=1634524&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Oct 27 12:44:16 2014
@@ -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.

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1634524&r1=1634523&r2=1634524&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Oct 27 12:44:16 2014
@@ -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

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_substitute.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_substitute.c?rev=1634524&r1=1634523&r2=1634524&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_substitute.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_substitute.c Mon Oct 27 12:44:16 2014
@@ -687,9 +687,9 @@ static void register_hooks(apr_pool_t *p
 }
 
 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}
 };