From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Wed, 10 Oct 2001 18:45:22 +0000 (+0000)
Subject: For some reason, I was thinking PEEK should read infinitely.  Not.
X-Git-Tag: 2.0.26~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55a8076e5da59f20174fdc7db19d8f8f24a77854;p=thirdparty%2Fapache%2Fhttpd.git

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 7951d822f59..9d26574bc6e 100644
--- 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;