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/modules/http http_protocol.c
Date Fri, 31 May 2002 00:23:34 GMT
aaron       02/05/30 17:23:34

  Modified:    modules/http http_protocol.c
  Log:
  This fixes a failed assert when r->remaining is left in a negative
  state and we hit some other error (like permission failure) causing
  an internal redirect causing us to reevaluate the input buffers
  (for discarding the request body).
  
  Revision  Changes    Path
  1.430     +4 -0      httpd-2.0/modules/http/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
  retrieving revision 1.429
  retrieving revision 1.430
  diff -u -r1.429 -r1.430
  --- http_protocol.c	30 May 2002 23:27:15 -0000	1.429
  +++ http_protocol.c	31 May 2002 00:23:34 -0000	1.430
  @@ -877,6 +877,8 @@
               ctx->remaining = get_chunk_size(line);
               /* Detect chunksize error (such as overflow) */
               if (ctx->remaining < 0) {
  +                ctx->remaining = 0; /* Reset it in case we have to
  +                                     * come back here later */
                   apr_brigade_cleanup(bb);
                   e = ap_bucket_error_create(HTTP_REQUEST_ENTITY_TOO_LARGE, NULL,
                                              f->r->pool,
  @@ -934,6 +936,8 @@
   
                   /* Detect chunksize error (such as overflow) */
                   if (ctx->remaining < 0) {
  +                    ctx->remaining = 0; /* Reset it in case we have to
  +                                         * come back here later */
                       apr_brigade_cleanup(bb);
                       e = ap_bucket_error_create(HTTP_REQUEST_ENTITY_TOO_LARGE,
                                                  NULL, f->r->pool,
  
  
  

Mime
View raw message