httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r892261 - in /httpd/httpd/branches/2.2.x: STATUS modules/filters/mod_filter.c
Date Fri, 18 Dec 2009 14:15:27 GMT
Author: jim
Date: Fri Dec 18 14:15:27 2009
New Revision: 892261

URL: http://svn.apache.org/viewvc?rev=892261&view=rev
Log:
  * 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


Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/filters/mod_filter.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=892261&r1=892260&r2=892261&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Dec 18 14:15:27 2009
@@ -87,11 +87,6 @@
 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:

Modified: httpd/httpd/branches/2.2.x/modules/filters/mod_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/filters/mod_filter.c?rev=892261&r1=892260&r2=892261&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/filters/mod_filter.c (original)
+++ httpd/httpd/branches/2.2.x/modules/filters/mod_filter.c Fri Dec 18 14:15:27 2009
@@ -201,9 +201,7 @@
          * 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



Mime
View raw message