httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0 CHANGES
Date Wed, 29 May 2002 23:04:15 GMT
jerenkrantz    02/05/29 16:04:15

  Modified:    modules/http http_protocol.c
               .        CHANGES
  Log:
  As discussed previously on-list, HTTP_IN should return EOS if it thinks
  there is no request body.
  
  Revision  Changes    Path
  1.426     +14 -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.425
  retrieving revision 1.426
  diff -u -r1.425 -r1.426
  --- http_protocol.c	29 May 2002 14:57:26 -0000	1.425
  +++ http_protocol.c	29 May 2002 23:04:14 -0000	1.426
  @@ -822,6 +822,20 @@
               }
           }
   
  +        /* If we don't have a request entity indicated by the headers, EOS.
  +         * (BODY_NONE is a valid intermediate state due to trailers,
  +         *  but it isn't a valid starting state.)
  +         *
  +         * RFC 2616 Section 4.4 note 5 states that connection-close
  +         * is invalid for a request entity - request bodies must be
  +         * denoted by C-L or T-E: chunked.
  +         */
  +        if (ctx->state == BODY_NONE) {
  +            e = apr_bucket_eos_create(f->r->connection->bucket_alloc);
  +            APR_BRIGADE_INSERT_TAIL(b, e);
  +            return APR_SUCCESS;
  +        }
  +
           /* Since we're about to read data, send 100-Continue if needed.
            * Only valid on chunked and C-L bodies where the C-L is > 0. */
           if ((ctx->state == BODY_CHUNK || 
  
  
  
  1.798     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.797
  retrieving revision 1.798
  diff -u -r1.797 -r1.798
  --- CHANGES	29 May 2002 21:28:05 -0000	1.797
  +++ CHANGES	29 May 2002 23:04:14 -0000	1.798
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.37
   
  +  *) Allow ap_http_filter (HTTP_IN) to return EOS when there is no request
  +     body.  [Justin Erenkrantz]
  +    
     *) NetWare: Piping log entries through RotateLogs using the 
        CustomLogs directive is finally supported now that we have 
   	 the pipes and spawning functionality working.
  
  
  

Mime
View raw message