Fix a small typo that was keeping us from copying os-inline.c to the

include directory

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86387 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index 2f0126adac2fa26386042bce329bdbe783a22dd6..6fb9430e2d7cc591a40ec05943f87e1da9718b2a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,7 +92,7 @@ install-include:
        @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)

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 2e6b6feafbc2d8be2a261e61d63ffd776799bb4a..e1c61d40391b611edf809269a0c48c06540e6c32 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -2362,8 +2362,22 @@ API_EXPORT(long) ap_get_client_block(request_rec *r, char *buffer, int bufsiz)
     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;