ARGH!!!!!!!
I diff'ed the Makefile.in, and then committed the whole tree. I'm backing
out the http_protocol change even as we speak. SORRY!!!!
Ryan
On 4 Oct 2000 rbb@locus.apache.org wrote:
> rbb 00/10/04 12:00:37
>
> Modified: src Makefile.in
> src/main http_protocol.c
> Log:
> Fix a small typo that was keeping us from copying os-inline.c to the
> include directory
>
> Revision Changes Path
> 1.33 +1 -1 apache-2.0/src/Makefile.in
>
> Index: Makefile.in
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/Makefile.in,v
> retrieving revision 1.32
> retrieving revision 1.33
> diff -u -r1.32 -r1.33
> --- Makefile.in 2000/09/09 12:46:49 1.32
> +++ Makefile.in 2000/10/04 19:00:34 1.33
> @@ -92,7 +92,7 @@
> @test -d $(includedir)/apr || $(MKINSTALLDIRS) $(includedir)/apr
> @cp -p include/*.h $(srcdir)/include/*.h $(includedir)
> @cp -p $(srcdir)/os/$(OS_DIR)/os.h $(includedir)
> - @if test -f $(srcdir)/os/$OSDIR/os-inline.c; then \
> + @if test -f $(srcdir)/os/$(OS_DIR)/os-inline.c; then \
> cp -p $(srcdir)/os/$(OS_DIR)/os-inline.c $(includedir); \
> fi;
> @cp -p $(srcdir)/modules/dav/main/mod_dav.h $(includedir)
>
>
>
> 1.136 +15 -1 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.135
> retrieving revision 1.136
> diff -u -r1.135 -r1.136
> --- http_protocol.c 2000/10/03 22:08:38 1.135
> +++ http_protocol.c 2000/10/04 19:00:36 1.136
> @@ -2362,8 +2362,22 @@
> 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;
> - rv = ap_bread(r->connection->client, buffer, len_to_read, &len_read);
> + 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);
> if (len_read == 0) { /* error or eof */
> if (rv != APR_SUCCESS) {
> r->connection->keepalive = -1;
>
>
>
>
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
|