Commit 6b0980f4 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Further refinement for PR41056 / PR 19954 (mostly-fixed in r480135.) 

We assume that a successful read but an empty brigade
is NOT cause for EAGAIN. Testing may or may not
confirm this assumption, in which case that test
may be required as well.


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

modules/http/http_filters.c

+4 −0
Original line number Diff line number Diff line
@@ -295,6 +295,10 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, 
                    rv = ap_get_brigade(f->next, bb, AP_MODE_GETLINE,

                                        block, 0);

                    apr_brigade_cleanup(bb);

                    if (block == APR_NONBLOCK_READ &&

                        (APR_STATUS_IS_EAGAIN(rv))) {

                        return APR_EAGAIN;

                    }

                } else {

                    rv = APR_SUCCESS;

                }