Commit 4da43cb0 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  This patch should address input buffering, requesting only as much from
  the client as the ap_get_client_block() buffer is prepared to accept.


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

modules/http/http_protocol.c

+4 −1
Original line number Diff line number Diff line
@@ -1435,8 +1435,11 @@ AP_DECLARE(long) ap_get_client_block(request_rec *r, char *buffer, apr_size_t bu 


    do {

        if (APR_BRIGADE_EMPTY(bb)) {

            apr_size_t asmuch = bufsiz;

            if (r->remaining < asmuch)

                asmuch = (apr_size_t)r->remaining;

            if (ap_get_brigade(r->input_filters, bb, AP_MODE_BLOCKING,

                               &r->remaining) != APR_SUCCESS) {

                               &asmuch) != APR_SUCCESS) {

                /* if we actually fail here, we want to just return and

                 * stop trying to read data from the client.

                 */