httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1523242 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/filters/mod_filter.c
Date Sat, 14 Sep 2013 14:01:27 GMT
Author: minfrin
Date: Sat Sep 14 14:01:27 2013
New Revision: 1523242

URL: http://svn.apache.org/r1523242
Log:
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

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_filter.c

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

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1523242&r1=1523241&r2=1523242&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sat Sep 14 14:01:27 2013
@@ -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.

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1523242&r1=1523241&r2=1523242&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Sep 14 14:01:27 2013
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_filter.c?rev=1523242&r1=1523241&r2=1523242&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_filter.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_filter.c Sat Sep 14 14:01:27 2013
@@ -368,6 +368,9 @@ static const char *filter_protocol(cmd_p
         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;
         }



Mime
View raw message