From: Greg Ames <gregames@apache.org>
Date: Fri, 8 Nov 2002 19:20:04 +0000 (+0000)
Subject: core_output_filter: straighten out the parens for the decision to set aside.
X-Git-Tag: 2.0.44~106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a809b7f73d5b22db3d5e91348b2eaa0f5f95c33c;p=apache

core_output_filter: straighten out the parens for the decision to set aside.

Pointed out by: gcc and Jeff Trawick


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

diff --git a/server/core.c b/server/core.c
index fb3010706a..c87ecefc15 100644
--- a/server/core.c
+++ b/server/core.c
@@ -3878,10 +3878,10 @@ static apr_status_t core_output_filter(ap_filter_t *f, apr_bucket_brigade *b)
          *      (IOW, this response is a bit more complex, but we save it
          *       with the hope of concatenating with another response)
          */
-        if ((nbytes + flen < AP_MIN_BYTES_TO_WRITE
-            && !fd && !more && !APR_BUCKET_IS_FLUSH(last_e))
+        if (nbytes + flen < AP_MIN_BYTES_TO_WRITE
+            && ((!fd && !more && !APR_BUCKET_IS_FLUSH(last_e))
                 || (APR_BUCKET_IS_EOS(last_e)
-                    && c->keepalive == AP_CONN_KEEPALIVE)) {
+                    && c->keepalive == AP_CONN_KEEPALIVE))) {
 
             /* NEVER save an EOS in here.  If we are saving a brigade with
              * an EOS bucket, then we are doing keepalive connections, and