httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.c
Date Sat, 24 Nov 2001 10:52:27 GMT
brianp      01/11/24 02:52:27

  Modified:    modules/filters mod_include.c
  Log:
  short-circuit out of xbithack_handler immediately if xbithack
  isn't enabled, and use strcmp instead of ap_strcmp_match for
  comparing against a non-wildcard pattern
  
  Revision  Changes    Path
  1.159     +8 -7      httpd-2.0/modules/filters/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
  retrieving revision 1.158
  retrieving revision 1.159
  diff -u -r1.158 -r1.159
  --- mod_include.c	2001/11/23 16:35:21	1.158
  +++ mod_include.c	2001/11/24 10:52:27	1.159
  @@ -3184,19 +3184,20 @@
   #else
       include_dir_config *conf;
    
  -    if (ap_strcmp_match(r->handler, "text/html")) {
  -        return DECLINED;
  -    }
  -    if (!(r->finfo.protection & APR_UEXECUTE)) {
  -        return DECLINED;
  -    }
  - 
       conf = (include_dir_config *) ap_get_module_config(r->per_dir_config,
                                                   &include_module);
    
       if (*conf->xbithack == xbithack_off) {
           return DECLINED;
       }
  +
  +    if (strcmp(r->handler, "text/html")) {
  +        return DECLINED;
  +    }
  +    if (!(r->finfo.protection & APR_UEXECUTE)) {
  +        return DECLINED;
  +    }
  + 
       /* We always return declined, because the default handler will actually
        * serve the file.  All we have to do is add the filter.
        */
  
  
  

Mime
View raw message