From: Eric Covener <covener@apache.org>
Date: Sat, 4 Jun 2022 20:21:24 +0000 (+0000)
Subject: Merge r1901645 from trunk:
X-Git-Tag: 2.4.54-rc3-candidate~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adefe64c3e2ba1b64be6d76766df48929837734c;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1901645 from trunk:

fixed in 1.7 SVN but not released

just in case we reroll.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901646 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/core_filters.c b/server/core_filters.c
index 7cfbdff2c15..d8a661f8cc2 100644
--- a/server/core_filters.c
+++ b/server/core_filters.c
@@ -629,7 +629,7 @@ static APR_INLINE int can_sendfile_bucket(apr_bucket *b)
 }
 #endif
 
-#if defined(WIN32) && (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION <= 6)
+#if defined(WIN32) && (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION <= 7)
 #undef APR_TCP_NOPUSH_FLAG
 #define APR_TCP_NOPUSH_FLAG 0
 #endif