httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard mod_include.c
Date Wed, 20 Sep 2000 18:36:06 GMT
trawick     00/09/20 11:36:06

  Modified:    src/modules/standard mod_include.c
  Log:
  Fix mixup in call to ap_brigade_split().
  
  Revision  Changes    Path
  1.61      +4 -3      apache-2.0/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- mod_include.c	2000/09/19 20:57:19	1.60
  +++ mod_include.c	2000/09/20 18:36:05	1.61
  @@ -2268,7 +2268,7 @@
       ap_bucket *dptr = AP_BRIGADE_FIRST(bb);
       ap_bucket *tagbuck, *dptr2;
       ap_bucket *endsec;
  -    ap_bucket_brigade *before_tag = NULL;
  +    ap_bucket_brigade *tag_and_after;
       int ret;
   
       apr_cpystrn(error, DEFAULT_ERROR_MSG, sizeof(error));
  @@ -2316,8 +2316,9 @@
   		ap_rputs(error, r);
                   return;
               }
  -            before_tag = ap_brigade_split(bb, dptr);
  -            ap_pass_brigade(f->next, before_tag);
  +            tag_and_after = ap_brigade_split(bb, dptr);
  +            ap_pass_brigade(f->next, bb); /* process what came before the tag */
  +            bb = tag_and_after;
               if (!strcmp(directive, "if")) {
                   if (!printing) {
                       if_nesting++;
  
  
  

Mime
View raw message