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 Thu, 20 Jun 2002 03:45:21 GMT
brianp      2002/06/19 20:45:21

  Modified:    modules/filters mod_include.c
  Log:
  Remove the old EOS logic that I neglected to delete on the last commit,
  and add a check for ap_pass_brigade() failure
  
  Revision  Changes    Path
  1.229     +5 -16     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.228
  retrieving revision 1.229
  diff -u -r1.228 -r1.229
  --- mod_include.c	20 Jun 2002 02:59:25 -0000	1.228
  +++ mod_include.c	20 Jun 2002 03:45:21 -0000	1.229
  @@ -3240,6 +3240,10 @@
                              /* Set aside tag, pass pre-tag... */
               tag_and_after = apr_brigade_split(*bb, ctx->head_start_bucket);
               rv = ap_pass_brigade(f->next, *bb);
  +            if (rv != APR_SUCCESS) {
  +                return rv;
  +            }
  +            
               /* Set aside the partial tag
                * Exception: if there's an EOS at the end of this brigade,
                * the tag will never be completed, so send an error and EOS
  @@ -3257,27 +3261,12 @@
                       apr_bucket_destroy(b);
                   }
                   CREATE_ERROR_BUCKET(ctx, err_bucket, b, err_bucket);
  -                ap_pass_brigade(f->next, tag_and_after);
  +                rv = ap_pass_brigade(f->next, tag_and_after);
               }
               else {
                   ap_save_brigade(f, &ctx->ssi_tag_brigade,
                                   &tag_and_after, r->pool);
               }
  -            if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(ctx->ssi_tag_brigade))) {
  -                apr_bucket *new_eos;
  -                /* Make sure there's no EOS at the end of the set-aside
  -                 * brigade, because we may later prepend it to some
  -                 * other brigade
  -                 */
  -                APR_BUCKET_REMOVE(APR_BRIGADE_LAST(ctx->ssi_tag_brigade));
  -
  -                /* And put an EOS on the brigade that we're about to pass
  -                 * to the next filter.
  -                 */
  -                new_eos = apr_bucket_eos_create((*bb)->bucket_alloc);
  -                APR_BRIGADE_INSERT_TAIL(*bb, new_eos);
  -            }
  -
               if (rv != APR_SUCCESS) {
                   return rv;
               }
  
  
  

Mime
View raw message