From ab726ee6656821a25852a6ad0ba35e5758847862 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Sat, 14 Sep 2013 14:01:27 +0000 Subject: [PATCH] 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 --- CHANGES | 4 ++++ STATUS | 6 ------ modules/filters/mod_filter.c | 3 +++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index de5aa4bfb3..88d610f476 100644 --- 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 c1e44e2fd9..c9d27179f8 100644 --- 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 2d8e8b6595..8fb872cdbf 100644 --- 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; } -- 2.50.1