From: Jim Jagielski <jim@apache.org>
Date: Fri, 18 Dec 2009 14:15:27 +0000 (+0000)
Subject:   * mod_filter: dispatch correctly where dispatch string doesn't exist
X-Git-Tag: 2.2.15~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5dd31232320ba389888a19018dfe46a104e866f;p=thirdparty%2Fapache%2Fhttpd.git

  * mod_filter: dispatch correctly where dispatch string doesn't exist
      PR 48054
          Trunk patch: n/a (trunk upgraded to use ap_expr for condition testing)
              2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=24418
                  +1: niq, rpluem, jim



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

diff --git a/STATUS b/STATUS
index 19bc96e05ce..7478f4e33aa 100644
--- a/STATUS
+++ b/STATUS
@@ -87,11 +87,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_filter: dispatch correctly where dispatch string doesn't exist
-    PR 48054
-    Trunk patch: n/a (trunk upgraded to use ap_expr for condition testing)
-    2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=24418
-    +1: niq, rpluem, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/modules/filters/mod_filter.c b/modules/filters/mod_filter.c
index 3ba13c954ec..73893642467 100644
--- a/modules/filters/mod_filter.c
+++ b/modules/filters/mod_filter.c
@@ -201,9 +201,7 @@ static int filter_lookup(ap_filter_t *f, ap_filter_rec_t *filter)
          * Not sure if there's anything better to do with them
          */
         if (!str) {
-            if (provider->match_type == DEFINED && provider->match.string) {
-                match = 0;
-            }
+            match = 0;
         }
         /* we can't check for NULL in provider as that kills integer 0
          * so we have to test each string/regexp case in the switch