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 7cfbdff2c1592ec3e52a315b5872101abc274e87..d8a661f8cc25b2e737c3a9fd4a37f3785e7b401e 100644 (file)
--- 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