httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_rewrite.c
Date Sun, 03 Aug 2003 19:14:55 GMT
nd          2003/08/03 12:14:55

  Modified:    modules/mappers mod_rewrite.c
  Log:
  subreq_ok *is* a macro.
  
  Revision  Changes    Path
  1.213     +9 -11     httpd-2.0/modules/mappers/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
  retrieving revision 1.212
  retrieving revision 1.213
  diff -u -r1.212 -r1.213
  --- mod_rewrite.c	3 Aug 2003 19:04:54 -0000	1.212
  +++ mod_rewrite.c	3 Aug 2003 19:14:55 -0000	1.213
  @@ -224,6 +224,15 @@
   #define LEFT_CURLY  '{'
   #define RIGHT_CURLY '}'
   
  +/*
  + * check that a subrequest won't cause infinite recursion
  + *
  + * either not in a subrequest, or in a subrequest
  + * and URIs aren't NULL and sub/main URIs differ
  + */
  +#define subreq_ok(r) (!r->main || \
  +    (r->main->uri && r->uri && strcmp(r->main->uri, r->uri)))
  +
   
   /*
    * +-------------------------------------------------------+
  @@ -1518,17 +1527,6 @@
       }
   
       return val;
  -}
  -
  -/* check that a subrequest won't cause infinite recursion */
  -static int subreq_ok(request_rec *r)
  -{
  -    /*
  -     * either not in a subrequest, or in a subrequest
  -     * and URIs aren't NULL and sub/main URIs differ
  -     */
  -    return (!r->main ||
  -            (r->main->uri && r->uri && strcmp(r->main->uri,
r->uri)));
   }
   
   /*
  
  
  

Mime
View raw message