For some reason, I was thinking PEEK should read infinitely. Not.

Return with APR_EOF if we get EAGAIN.

(Whomever is calling this with PEEK should really be able to handle EOS
 bucket rather than relying on error codes.)

Thanks to Greg Ames for pointing out this fubar.

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

diff --git a/server/core.c b/server/core.c
index 7951d822f59e652443df6b45d1846aa66b3dc021..9d26574bc6e29dc45385b177be0e4723ed38273c 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -2806,7 +2806,7 @@ static int core_input_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mod
             rv = apr_bucket_read(e, &str, &len, APR_NONBLOCK_READ);
 
             if (APR_STATUS_IS_EAGAIN(rv)) {
-                continue;
+                return APR_EOF;
             }
             else if (rv != APR_SUCCESS)
                 return rv;