]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
force to 0 on 1.6 on Windows
authorEric Covener <covener@apache.org>
Sat, 4 Jun 2022 12:06:23 +0000 (12:06 +0000)
committerEric Covener <covener@apache.org>
Sat, 4 Jun 2022 12:06:23 +0000 (12:06 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1901619 13f79535-47bb-0310-9956-ffa450edef68

server/core_filters.c

index 0f7a093a3ae5ad6b24a152f0a0abfd84eafcc0b9..9a9b7ca9f77010597a60b6938aaf13780feceeaa 100644 (file)
@@ -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