httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.c
Date Thu, 23 Aug 2001 15:35:50 GMT
gregames    01/08/23 08:35:50

  Modified:    modules/filters mod_include.c
  Log:
  whoops!  replace two post 2.0.24 fixes I accidently wiped out yesterday.
  
  Reported by: Jeff Trawick, Paul Reder
  
  Revision  Changes    Path
  1.128     +4 -2      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.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- mod_include.c	2001/08/22 23:12:24	1.127
  +++ mod_include.c	2001/08/23 15:35:50	1.128
  @@ -275,6 +275,7 @@
                   if (ctx->state == PARSE_DIRECTIVE) {
                       /* gonna start over parsing the directive next time through */
                       ctx->directive_length = 0;
  +                    ctx->tag_length       = 0;
                   }
                   return dptr;
               }
  @@ -832,8 +833,9 @@
                       for (p = r; p != NULL && !founddupe; p = p->main) {
       		    request_rec *q;
       		    for (q = p; q != NULL; q = q->prev) {
  -    			if ( (strcmp(q->filename, rr->filename) == 0) ||
  -    			     (strcmp(q->uri, rr->uri) == 0) ){
  +                        if ((q->filename && rr->filename && 
  +                                    (strcmp(q->filename, rr->filename) == 0)) ||
  +                                (strcmp(q->uri, rr->uri) == 0)) {
       			    founddupe = 1;
       			    break;
       			}
  
  
  

Mime
View raw message