From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Wed, 10 Oct 2001 19:19:16 +0000 (+0000)
Subject: Yeah, let's just return this segment to how it was a few hours ago.
X-Git-Tag: 2.0.26~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4efc87318309f2f432c6005c0cd2d6974a1d2330;p=thirdparty%2Fapache%2Fhttpd.git

Yeah, let's just return this segment to how it was a few hours ago.

If the status code is anything other than SUCCESS for PEEK, it isn't
good.  Just return the value.

(I thought it should be this, but I wasn't 100% sure.  Peer review == good.)

Submitted by:	Will Rowe


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

diff --git a/server/core.c b/server/core.c
index 9d26574bc6e..1286dadcd4c 100644
--- a/server/core.c
+++ b/server/core.c
@@ -2805,10 +2805,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)) {
-                return APR_EOF;
-            }
-            else if (rv != APR_SUCCESS)
+            if (rv != APR_SUCCESS)
                 return rv;
 
             c = str;