Remove more network logic from the MPMs. Essentially, each MPM can define

AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK, which tells Apache to disable_nagle
on the accepted socket.

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

diff --git a/server/core.c b/server/core.c
index fad948aae8a162951d05b270f478012b69bc629c..fa5bce97ed5383fabac7fadf5894d08fceafb7aa 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -3281,6 +3281,10 @@ static conn_rec *core_create_conn(apr_pool_t *ptrans, apr_socket_t *csd,
 {
     core_net_rec *net = apr_palloc(ptrans, sizeof(*net));
 
+#ifdef AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
+    ap_sock_disable_nagle(csd);
+#endif
+
     net->in_ctx = NULL;
     net->out_ctx = NULL;
     net->c = ap_core_new_connection(ptrans, ap_server_conf, csd,

diff --git a/server/mpm/mpmt_os2/mpm.h b/server/mpm/mpmt_os2/mpm.h
index 37d2f6c20c4ee5186fe55888649d9b521e4df01a..8291769685da2271d950040c220b85ba61ca8393 100644 (file)
--- a/server/mpm/mpmt_os2/mpm.h
+++ b/server/mpm/mpmt_os2/mpm.h
@@ -70,5 +70,6 @@
 extern server_rec *ap_server_conf;
 #define AP_MPM_WANT_SET_PIDFILE
 #define AP_MPM_WANT_SET_MAX_REQUESTS
+#define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
 
 #endif /* APACHE_MPM_SPMT_OS2_H */

diff --git a/server/mpm/mpmt_os2/mpmt_os2_child.c b/server/mpm/mpmt_os2/mpmt_os2_child.c
index 3f9a685635dece0858bfa8344619626bd2751e09..3122eedca5e692838b5eb395ec68e15b65c4e7f1 100644 (file)
--- a/server/mpm/mpmt_os2/mpmt_os2_child.c
+++ b/server/mpm/mpmt_os2/mpmt_os2_child.c
@@ -406,7 +406,6 @@ static void worker_main(void *vpArg)
     while (rc = DosReadQueue(workq, &rd, &len, (PPVOID)&worker_args, 0, DCWW_WAIT, &priority, NULLHANDLE),
            rc == 0 && rd.ulData != WORKTYPE_EXIT) {
         pconn = worker_args->pconn;
-        ap_sock_disable_nagle(worker_args->conn_sd);
         current_conn = ap_run_create_connection(pconn, worker_args->conn_sd, conn_id);
 
         if (current_conn) {

diff --git a/server/mpm/netware/mpm.h b/server/mpm/netware/mpm.h
index 7ec0a1be3c5dab70ebe17d53de35589ff7f0bca3..da809db1a7abea0cfa7d9bf8fc761a30a17677ee 100644 (file)
--- a/server/mpm/netware/mpm.h
+++ b/server/mpm/netware/mpm.h
@@ -72,6 +72,7 @@
   #define AP_MPM_WANT_SET_LOCKFILE 
 */
 #define AP_MPM_WANT_SET_MAX_REQUESTS
+#define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
 /*#define AP_MPM_WANT_SET_COREDUMPDIR
   #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH 
 */

diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index db5c5894d123e4cfe2d9bca7411f07e2c358e846..e085887860249c4e56ecab338d43baf96a0a0964 100644 (file)
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -504,8 +504,6 @@ got_listener:
         * We now have a connection, so set it up with the appropriate
         * socket options, file descriptors, and read/write buffers.
         */
-        ap_sock_disable_nagle(csd);
-
         current_conn = ap_run_create_connection(ptrans, csd, my_worker_num);
         if (current_conn) {
             ap_process_connection(current_conn);

diff --git a/server/mpm/prefork/mpm.h b/server/mpm/prefork/mpm.h
index 48a5a3df88ad077a2ea2ef3fcb024c0eeb688046..32e5512255bd108d262ac655304385ada038fd84 100644 (file)
--- a/server/mpm/prefork/mpm.h
+++ b/server/mpm/prefork/mpm.h
@@ -77,6 +77,7 @@
 #define AP_MPM_WANT_SET_MAX_REQUESTS
 #define AP_MPM_WANT_SET_COREDUMPDIR
 #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
+#define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
 
 #define AP_MPM_USES_POD 1
 #define MPM_SYNC_CHILD_TABLE() (ap_sync_scoreboard_image())

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 63deee8bb84c0b81e86117ea7a3e5002c5ecaa70..d511a9ea362eb196fd27315b60b8e9c6d62d775e 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -787,8 +787,6 @@ static void child_main(int child_num_arg)
         }
 #endif
 
-       ap_sock_disable_nagle(csd);
-
        current_conn = ap_run_create_connection(ptrans, csd, my_child_num);
         if (current_conn) {
             ap_process_connection(current_conn);

diff --git a/server/mpm/spmt_os2/mpm.h b/server/mpm/spmt_os2/mpm.h
index d91687cf6d3fc47532acfba6c592af034f6338de..f3a3214137a62c5a03b6c98352e02cca06b7af17 100644 (file)
--- a/server/mpm/spmt_os2/mpm.h
+++ b/server/mpm/spmt_os2/mpm.h
@@ -71,6 +71,7 @@
 #define AP_MPM_WANT_SET_MAX_REQUESTS
 #define AP_MPM_WANT_SET_COREDUMPDIR
 #define AP_MPM_WANT_PROCESS_CHILD_STATUS
+#define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
 
 extern server_rec *ap_server_conf;
 extern int ap_threads_per_child;

diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index e967959def2c9fcad91df6656782b0900e604415..34a7c70f3877b6dc3b4955a965a44e6c90d42b87 100644 (file)
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -677,9 +677,6 @@ static void thread_main(void *thread_num_arg)
         * We now have a connection, so set it up with the appropriate
         * socket options, file descriptors, and read/write buffers.
         */
-
-       ap_sock_disable_nagle(csd);
-
        current_conn = ap_run_create_connection(ptrans, csd,
                                          THREAD_GLOBAL(thread_num));
 

diff --git a/server/mpm/threaded/mpm.h b/server/mpm/threaded/mpm.h
index fdd87263e928a39cb33e58eb58861547ed473532..2f71f711d6b6b92366624649069466b0a76f7368 100644 (file)
--- a/server/mpm/threaded/mpm.h
+++ b/server/mpm/threaded/mpm.h
@@ -74,6 +74,7 @@
 #define AP_MPM_WANT_SET_MAX_REQUESTS
 #define AP_MPM_WANT_SET_COREDUMPDIR
 #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
+#define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
 
 #define MPM_SYNC_CHILD_TABLE() (ap_sync_scoreboard_image())
 #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)

diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index 370049c16a6e5f21eac0e25813c48817fceb5ec8..a7d62e5bfd0932c65645ac5234eae9095cfd3385 100644 (file)
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -473,8 +473,6 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num,
         return;
     }
 
-    ap_sock_disable_nagle(sock);
-
     current_conn = ap_run_create_connection(p, sock, conn_id);
     if (current_conn) {
         ap_process_connection(current_conn);

diff --git a/server/mpm/worker/mpm.h b/server/mpm/worker/mpm.h
index a9a91455ec59a8d31f4acf58229f7236fd42655b..911d70cca32dbe37c3176d1c40296b50d3759a6b 100644 (file)
--- a/server/mpm/worker/mpm.h
+++ b/server/mpm/worker/mpm.h
@@ -74,6 +74,7 @@
 #define AP_MPM_WANT_SET_MAX_REQUESTS
 #define AP_MPM_WANT_SET_COREDUMPDIR
 #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
+#define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
 
 #define MPM_SYNC_CHILD_TABLE() (ap_sync_scoreboard_image())
 #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 7b77e616409419e75b740481acbfe8560bb31d6a..203688b11d7e153d3c592486b82d108c5e7ef193 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -497,8 +497,6 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num,
         return;
     }
 
-    ap_sock_disable_nagle(sock);
-
     current_conn = ap_run_create_connection(p, sock, conn_id);
     if (current_conn) {
         ap_process_connection(current_conn);