Move sock_disable_nagle to mpm_common.c. Rename it to ap_sock_disable_nagle.

Again, I tried to modify all MPMs that are currently using this code.


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

1 files changed, 20 insertions, 0 deletions

diff --git a/server/mpm_common.c b/server/mpm_common.c
index 9f2923a843..d24cc11396 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -276,4 +276,24 @@ void ap_process_child_status(ap_proc_t *pid, ap_wait_t status)
     }
 }
 
+#if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)
+void ap_sock_disable_nagle(int s)
+{
+    /* The Nagle algorithm says that we should delay sending partial
+     * packets in hopes of getting more data.  We don't want to do
+     * this; we are not telnet.  There are bad interactions between
+     * persistent connections and Nagle's algorithm that have very severe
+     * performance penalties.  (Failing to disable Nagle is not much of a
+     * problem with simple HTTP.)
+     *
+     * In spite of these problems, failure here is not a shooting offense.
+     */
+    int just_say_no = 1;
 
+    if (ap_setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &just_say_no,
+                   sizeof(int)) != APR_SUCCESS) {
+        ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf,
+                    "setsockopt: (TCP_NODELAY)");
+    }
+}
+#endif