APRize disabling nagle (setting TCP_NODELAY).

[apache] / server / mpm / perchild / perchild.c

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index 89216517b7625efc1c44aa69449bfae959f345a3..ab3a0cbd574d1fc070936087a8215339af7f1bfa 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -111,7 +111,6 @@ static const char *ap_pid_fname=NULL;
 API_VAR_EXPORT const char *ap_scoreboard_fname=NULL;
 static int num_daemons=0;
 static int curr_child_num=0;
-static int socket_num=0;
 static int workers_may_exit = 0;
 static int requests_this_child;
 static int num_listenfds = 0;
@@ -132,7 +131,6 @@ typedef struct {
 } perchild_server_conf;
 
 typedef struct child_info_t child_info_t;
-typedef struct socket_info_t socket_info_t;
 
 /* Tables used to determine the user and group each child process should
  * run as.  The hash table is used to correlate a server name with a child
@@ -455,7 +453,7 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, long conn_id)
     }
 
     if (thread_socket_table[thread_num] < 0) {
-        ap_sock_disable_nagle(csd);
+        ap_sock_disable_nagle(sock);
     }
     iol = ap_iol_attach_socket(p, sock);
     conn_io = ap_bcreate(p, B_RDWR);
@@ -1066,7 +1064,7 @@ static void perform_child_maintenance(void)
 static void server_main_loop(int remaining_children_to_start)
 {
     int child_slot;
-    ap_wait_t status;
+    apr_wait_t status;
     apr_proc_t pid;
     int i;
 
@@ -1333,7 +1331,6 @@ static void perchild_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *pte
     max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
     ap_perchild_set_maintain_connection_status(1);
     curr_child_num = 0;
-    socket_num = 0;
 
     apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
 
@@ -1687,7 +1684,6 @@ static const char *set_child_per_uid(cmd_parms *cmd, void *dummy, const char *u,
         ug->uid = atoi(u);
         ug->gid = atoi(g); 
     }
-    socket_num++;
     return NULL;
 }
 
@@ -1759,8 +1755,6 @@ static void *perchild_create_config(apr_pool_t *p, server_rec *s)
     perchild_server_conf *c =
     (perchild_server_conf *) apr_pcalloc(p, sizeof(perchild_server_conf));
 
-    c->sockname = ap_server_root_relative(p, DEFAULT_PERCHILD_SOCKET);
-    c->fullsockname = NULL;
     c->sd = -1;
     return c;
 }