Merge r1901619 from trunk:

force to 0 on 1.6 on Windows

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

diff --git a/server/core_filters.c b/server/core_filters.c
index 50a6b8d1371726876ec1f9320cfef67ac55aa4a3..7cfbdff2c1592ec3e52a315b5872101abc274e87 100644 (file)
--- a/server/core_filters.c
+++ b/server/core_filters.c
@@ -25,6 +25,7 @@
 #include "apr_fnmatch.h"
 #include "apr_hash.h"
 #include "apr_thread_proc.h"    /* for RLIMIT stuff */
+#include "apr_version.h"
 
 #define APR_WANT_IOVEC
 #define APR_WANT_STRFUNC
@@ -628,6 +629,11 @@ static APR_INLINE int can_sendfile_bucket(apr_bucket *b)
 }
 #endif
 
+#if defined(WIN32) && (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION <= 6)
+#undef APR_TCP_NOPUSH_FLAG
+#define APR_TCP_NOPUSH_FLAG 0
+#endif
+
 static APR_INLINE void sock_nopush(apr_socket_t *s, int to)
 {
     /* Disable TCP_NOPUSH handling on OSX since unsetting it won't push