httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/main http_protocol.c
Date Wed, 04 Oct 2000 19:08:34 GMT
rbb         00/10/04 12:08:34

  Modified:    src/main http_protocol.c
  Log:
  Back out a patch that should never have been committed
  
  Revision  Changes    Path
  1.137     +1 -15     apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.136
  retrieving revision 1.137
  diff -u -r1.136 -r1.137
  --- http_protocol.c	2000/10/04 19:00:36	1.136
  +++ http_protocol.c	2000/10/04 19:08:34	1.137
  @@ -2362,22 +2362,8 @@
       apr_status_t rv;
   
       if (!r->read_chunked) {     /* Content-length read */
  -        ap_bucket *b;
  -        const char *tempbuf;
  -
           len_to_read = (r->remaining > bufsiz) ? bufsiz : r->remaining;
  -        if (AP_BRIGADE_EMPTY(r->connection->input_data)) {
  -            ap_get_brigade(r->connection->input_filters, r->connection->input_data);

  -        }
  -        b = AP_BRIGADE_FIRST(r->connection->input_data);
  -        len_read = len_to_read;
  -        rv = b->read(b, &tempbuf, &len_read, 0);
  -        if (len_read < b->length) {
  -            b->split(b, len_read);
  -        }
  -        memcpy(buffer, tempbuf, len_read);
  -        AP_BUCKET_REMOVE(b);
  -        b->destroy(b);
  +        rv = ap_bread(r->connection->client, buffer, len_to_read, &len_read);
           if (len_read == 0) {    /* error or eof */
               if (rv != APR_SUCCESS) {
                   r->connection->keepalive = -1;
  
  
  

Mime
View raw message