httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/modules/http http_protocol.c
Date Sun, 26 Aug 2001 18:57:16 GMT
dougm       01/08/26 11:57:16

  Modified:    modules/http http_protocol.c
  Log:
  ap_content_length_filter has already set Content-Length
  before ap_set_keepalive is called.  need to remove this check
  in order for keepalives to work.
  
  Revision  Changes    Path
  1.359     +7 -1      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.358
  retrieving revision 1.359
  diff -u -r1.358 -r1.359
  --- http_protocol.c	2001/08/26 04:59:37	1.358
  +++ http_protocol.c	2001/08/26 18:57:16	1.359
  @@ -136,7 +136,14 @@
   	&& ((r->status == HTTP_NOT_MODIFIED)
   	    || (r->status == HTTP_NO_CONTENT)
   	    || r->header_only
  +#if 0
  +            /* this was right in 1.x, but in 2.x
  +             * ap_content_length_filter has already set Content-Length
  +             * before this function is called
  +             * XXX: should there be a different check in place of this?
  +             */
   	    || apr_table_get(r->headers_out, "Content-Length")
  +#endif
   	    || ap_find_last_token(r->pool,
   				  apr_table_get(r->headers_out,
   						"Transfer-Encoding"),
  @@ -1234,7 +1241,6 @@
       if (r->chunked) {
           apr_table_mergen(r->headers_out, "Transfer-Encoding", "chunked");
           apr_table_unset(r->headers_out, "Content-Length");
  -
       }
   
       apr_table_setn(r->headers_out, "Content-Type", ap_make_content_type(r,
  
  
  

Mime
View raw message