Commit 2c953b87 authored by Joe Orton's avatar Joe Orton
Browse files

* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response): 

  Treat EAGAIN as an error for a blocking read from the input filter
  stack.


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

modules/proxy/mod_proxy_http.c

+3 −2
Original line number Diff line number Diff line
@@ -1964,8 +1964,9 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, 


                    /* ap_get_brigade will return success with an empty brigade

                     * for a non-blocking read which would block: */

                    if (APR_STATUS_IS_EAGAIN(rv)

                        || (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb))) {

                    if (mode == APR_NONBLOCK_READ

                        && (APR_STATUS_IS_EAGAIN(rv)

                            || (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb)))) {

                        /* flush to the client and switch to blocking mode */

                        e = apr_bucket_flush_create(c->bucket_alloc);

                        APR_BRIGADE_INSERT_TAIL(bb, e);