summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2022-06-04 12:06:23 +0000
committerEric Covener <covener@apache.org>2022-06-04 12:06:23 +0000
commitccefe16135970fa3d09d0491fc033e6d3a06e12a (patch)
tree13334da6567388e4aae6bdb856af6addc246022c /server
parentcb9854c3424b9fb7ba4751bb27ede89578788a59 (diff)
downloadhttpd-ccefe16135970fa3d09d0491fc033e6d3a06e12a.tar.gz
force to 0 on 1.6 on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1901619 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
-rw-r--r--server/core_filters.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/server/core_filters.c b/server/core_filters.c
index 0f7a093a3a..9a9b7ca9f7 100644
--- 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
@@ -493,6 +494,11 @@ static void delete_meta_bucket(apr_bucket *bucket)
apr_bucket_delete(bucket);
}
+#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