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 21:50:51 GMT
trawick     00/09/20 14:50:50

  Modified:    src/modules/standard mod_include.c
  Log:
  Fix the prior fix to the usage of ap_brigade_split()...  The caller of
  send_parsed_content() needs to see the new brigade representing the
  rest of the content.
  
  Revision  Changes    Path
  1.62      +10 -10    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.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- mod_include.c	2000/09/20 18:36:05	1.61
  +++ mod_include.c	2000/09/20 21:50:50	1.62
  @@ -2255,7 +2255,7 @@
   
   /* This is a stub which parses a file descriptor. */
   
  -static void send_parsed_content(ap_bucket_brigade *bb, request_rec *r, 
  +static void send_parsed_content(ap_bucket_brigade **bb, request_rec *r, 
                                   ap_filter_t *f)
   {
       char directive[MAX_STRING_LEN], error[MAX_STRING_LEN];
  @@ -2265,7 +2265,7 @@
       int if_nesting;
       int printing;
       int conditional_status;
  -    ap_bucket *dptr = AP_BRIGADE_FIRST(bb);
  +    ap_bucket *dptr = AP_BRIGADE_FIRST(*bb);
       ap_bucket *tagbuck, *dptr2;
       ap_bucket *endsec;
       ap_bucket_brigade *tag_and_after;
  @@ -2289,12 +2289,12 @@
                     ap_escape_shell_cmd(r->pool, arg_copy));
       }
   
  -    AP_BRIGADE_FOREACH(dptr, bb) {
  -        if ((tagbuck = find_string(dptr, STARTING_SEQUENCE, AP_BRIGADE_LAST(bb))) != NULL)
{
  +    AP_BRIGADE_FOREACH(dptr, *bb) {
  +        if ((tagbuck = find_string(dptr, STARTING_SEQUENCE, AP_BRIGADE_LAST(*bb))) != NULL)
{
               dptr2 = tagbuck;
               dptr = tagbuck;
  -            while (dptr2 != AP_BRIGADE_SENTINEL(bb) && 
  -                  (endsec = find_string(dptr2, ENDING_SEQUENCE, AP_BRIGADE_LAST(bb))) ==
NULL) {
  +            while (dptr2 != AP_BRIGADE_SENTINEL(*bb) && 
  +                  (endsec = find_string(dptr2, ENDING_SEQUENCE, AP_BRIGADE_LAST(*bb)))
== NULL) {
                   dptr2 = AP_BUCKET_NEXT(dptr2);
               }
               if (endsec == NULL) {
  @@ -2316,9 +2316,9 @@
   		ap_rputs(error, r);
                   return;
               }
  -            tag_and_after = ap_brigade_split(bb, dptr);
  -            ap_pass_brigade(f->next, bb); /* process what came before the tag */
  -            bb = tag_and_after;
  +            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++;
  @@ -2513,7 +2513,7 @@
       ap_bsetopt(r->connection->client, BO_WXLATE, &ap_hdrs_to_ascii);
   #endif
   
  -    send_parsed_content(b, r, f);
  +    send_parsed_content(&b, r, f);
       ap_pass_brigade(f->next, b);
   
       if (parent) {
  
  
  

Mime
View raw message