httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aa...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Wed, 06 Mar 2002 18:03:19 GMT
aaron       02/03/06 10:03:19

  Modified:    server   core.c
  Log:
  Fix a bug in the APR_MODE_EXHAUSTIVE mode for the core input filter.
  This patch changes nothing outside of that mode.
  
  Also, why do we ever call apr_brigade_length() in the core? This doesn't
  seem right to me, so here's a comment above the other call.
  
  Revision  Changes    Path
  1.159     +6 -3      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.158
  retrieving revision 1.159
  diff -u -r1.158 -r1.159
  --- core.c	5 Mar 2002 20:42:54 -0000	1.158
  +++ core.c	6 Mar 2002 18:03:19 -0000	1.159
  @@ -3389,11 +3389,13 @@
        */
       if (mode == AP_MODE_EXHAUSTIVE) {
           apr_bucket *e;
  -        apr_off_t total;
   
  -        /* Force a recompute of the length and force a read-all */
  -        apr_brigade_length(ctx->b, 1, &total);
  +        /* Tack on any buckets that were set aside. */
           APR_BRIGADE_CONCAT(b, ctx->b);
  +
  +        /* Since we've just added all potential buckets (which will most
  +         * likely simply be the socket bucket) we know this is the end,
  +         * so tack on an EOS too. */
           /* We have read until the brigade was empty, so we know that we
            * must be EOS. */
           e = apr_bucket_eos_create();
  @@ -3463,6 +3465,7 @@
           /* Take what was originally there and place it back on ctx->b */
           APR_BRIGADE_CONCAT(ctx->b, newbb);
   
  +        /* XXX: Why is this here? We never use 'total'! */
           apr_brigade_length(b, 1, &total);
   
           return APR_SUCCESS;
  
  
  

Mime
View raw message