Rely on APR to determine whether or not we have netinet/tcp.h. This test

requires a special work-around for IRIX 6.5, which will be in APR soon.
There is no need for it in Apache.

The include of netinet/tcp.h was removed from perchild.c and threaded.c.
They no longer seem to be needed there.

PR:		6459

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88455 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/configure.in b/configure.in
index 39d22b0942e5987ad69228eba523ef73fae88a4f..07f497a7c357779c2c4646a5eed9ae301aff6777 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -89,7 +89,6 @@ string.h \
 limits.h \
 unistd.h \
 sys/socket.h \
-netinet/tcp.h \
 pwd.h \
 grp.h \
 strings.h

diff --git a/include/mpm_common.h b/include/mpm_common.h
index 4a769574c09fce21d635ae2be04d09685e2ecb50..860075a1f8a7ad205fa31b275b7dcce8bfc6d8d9 100644 (file)
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -72,7 +72,7 @@
 
 #include "ap_config.h"
 
-#ifdef HAVE_NETINET_TCP_H
+#if APR_HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>    /* for TCP_NODELAY */
 #endif
 

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 05ff39a28c26f5157b4c407352be4ef14cba3e47..ad19ac8e90780dccddad371994cb5e162c9b8554 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -92,10 +92,6 @@
 #include "scoreboard.h"
 #include "util_filter.h"
 
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
-
 /* ### should be APR-ized */
 #include <poll.h>
 #include <grp.h>

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index 05ff39a28c26f5157b4c407352be4ef14cba3e47..ad19ac8e90780dccddad371994cb5e162c9b8554 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -92,10 +92,6 @@
 #include "scoreboard.h"
 #include "util_filter.h"
 
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
-
 /* ### should be APR-ized */
 #include <poll.h>
 #include <grp.h>

diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index db5bda9e39d165ce58a2500524acaf0f32890368..75bda0507fda3e25bcf76e41e50052eb4bc4c47c 100644 (file)
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -88,10 +88,6 @@
 #include "ap_listen.h"
 #include "scoreboard.h" 
 
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
-
 #include <signal.h>
 
 /*