mod_filter: Allow mod_filter to undo equiv of change=yes that was

baked into a filter provider.

trunk patch: http://svn.apache.org/r1519475

Submitted by: covener
Reviewed by: jim, minfrin

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

diff --git a/CHANGES b/CHANGES
index de5aa4bfb3b6771f75fed8720b77bba65cba1bfd..88d610f47674cc61ef33ca29d8b459fca4b20137 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.7
 
+  *) mod_filter: Add "change=no" as a proto-flag to FilterProtocol
+     to remove a providers initial flags set at registration time.
+     [Eric Covener]
+
   *) core, mod_ssl: Enable the ability for a module to reverse the sense of
      a poll event from a read to a write or vice versa. This is a step on
      the way to allow mod_ssl taking full advantage of the event MPM.

diff --git a/STATUS b/STATUS
index c1e44e2fd9abda6f7b218694a19f1f6e937603f6..c9d27179f80b8325dfdedbc29a1466322e9c31e3 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -163,12 +163,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk patch works
     +1: trawick, covener, humbedooh
 
-  * mod_filter: Allow mod_filter to undo equiv of change=yes that was
-    baked into a filter provider.
-    trunk patch: http://svn.apache.org/r1519475
-    2.4.x patch: trunk works
-    +1: covener, jim, minfrin
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/modules/filters/mod_filter.c b/modules/filters/mod_filter.c
index 2d8e8b6595ba4d00a8676fcbdc6d8c052668081c..8fb872cdbf28f17efe56a98ab2f397ad1821887f 100644 (file)
--- a/modules/filters/mod_filter.c
+++ b/modules/filters/mod_filter.c
@@ -368,6 +368,9 @@ static const char *filter_protocol(cmd_parms *cmd, void *CFG, const char *fname,
         if (!strcasecmp(arg, "change=yes")) {
             flags |= AP_FILTER_PROTO_CHANGE | AP_FILTER_PROTO_CHANGE_LENGTH;
         }
+        if (!strcasecmp(arg, "change=no")) {
+            flags &= ~(AP_FILTER_PROTO_CHANGE | AP_FILTER_PROTO_CHANGE_LENGTH);
+        }
         else if (!strcasecmp(arg, "change=1:1")) {
             flags |= AP_FILTER_PROTO_CHANGE;
         }