summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2022-03-09 18:19:36 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2022-03-09 18:19:36 +0000
commitf8972d3c08ad582faba1de125ff9203c2a51c2e0 (patch)
treea59dc15a368ad59cb39a4c8fb168bbf5564bcd6e
parent35f3bfb94898ca49155cd91f8cad0a566d24841a (diff)
downloadlibapr-f8972d3c08ad582faba1de125ff9203c2a51c2e0.tar.gz
Fix apr.hw input file, tcp_nopush absent on Windows
Submitted by: ylavic git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1898799 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--STATUS5
-rw-r--r--include/apr.hw2
2 files changed, 1 insertions, 6 deletions
diff --git a/STATUS b/STATUS
index aaac8ac97..5252b287f 100644
--- a/STATUS
+++ b/STATUS
@@ -95,11 +95,6 @@ RELEASE SHOWSTOPPERS:
CURRENT VOTES:
- * Fix trivial 'configure apr.h.in' copy/paste error inside apr.hw
- -#define APR_TCP_NOPUSH_FLAG @apr_tcp_nopush_flag@
- +#define APR_TCP_NOPUSH_FLAG 0
- +1: ylavic, wrowe
- [Confirmed against ws2tcpip.h, doesn't exist]
CURRENT test/testall -v EXCEPTIONS:
diff --git a/include/apr.hw b/include/apr.hw
index 35a958988..4247d6135 100644
--- a/include/apr.hw
+++ b/include/apr.hw
@@ -367,7 +367,7 @@ extern "C" {
/* If we have a TCP implementation that can be "corked", what flag
* do we use?
*/
-#define APR_TCP_NOPUSH_FLAG @apr_tcp_nopush_flag@
+#define APR_TCP_NOPUSH_FLAG 0
/* Is the TCP_NODELAY socket option inherited from listening sockets?
*/