Use ap_new_connection in pthread MPM. This required adding an argument

to ap_new_connection for now: thread_num.

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

diff --git a/include/http_connection.h b/include/http_connection.h
index 47bf42494f9e02b5081ccfeee3ec25f4d861e9cd..95657a15ebf7ea97495b5a5b6863434869008098 100644 (file)
--- a/include/http_connection.h
+++ b/include/http_connection.h
@@ -65,7 +65,7 @@ extern "C" {
 conn_rec *ap_new_connection(pool *p, server_rec *server, BUFF *inout,
                            const struct sockaddr_in *remaddr,
                            const struct sockaddr_in *saddr,
-                           int child_num);
+                           int child_num, int thread_num);
 CORE_EXPORT(void) ap_process_connection(conn_rec *);
 
 #ifdef __cplusplus

diff --git a/server/connection.c b/server/connection.c
index 2d190489282c43aea9ea3cb9d770eb3af3444e27..557f3188115f93cd15fe311db344a16824744564 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -244,7 +244,7 @@ CORE_EXPORT(void) ap_process_connection(conn_rec *c)
 conn_rec *ap_new_connection(pool *p, server_rec *server, BUFF *inout,
                            const struct sockaddr_in *remaddr,
                            const struct sockaddr_in *saddr,
-                           int child_num)
+                           int child_num, int thread_num)
 {
     conn_rec *conn = (conn_rec *) ap_pcalloc(p, sizeof(conn_rec));
 
@@ -255,6 +255,7 @@ conn_rec *ap_new_connection(pool *p, server_rec *server, BUFF *inout,
     conn->conn_config=ap_create_conn_config(p);
 
     conn->child_num = child_num;
+    conn->thread_num = thread_num;
 
     conn->pool = p;
     conn->local_addr = *saddr;

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 031f0ab961b63b430d011f785e69dbabcb30c877..c6d7c0cade9831c8ed59455159421de0131b50be 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -754,37 +754,6 @@ static int setup_listeners(pool *pconf, server_rec *s)
  * Here follows a long bunch of generic server bookkeeping stuff...
  */
 
-/*****************************************************************
- * Connection structures and accounting...
- */
-
-
-static conn_rec *new_connection(pool *p, server_rec *server, BUFF *inout,
-                                const struct sockaddr_in *remaddr,   /* ZZZ */
-                                const struct sockaddr_in *saddr,     /* ZZZ */
-                            int child_num, int thread_num)
-{
-    conn_rec *conn = (conn_rec *) ap_pcalloc(p, sizeof(conn_rec));
-
-    /* Got a connection structure, so initialize what fields we can
-     * (the rest are zeroed out by pcalloc).
-     */
-
-    conn->child_num = child_num;
-    conn->thread_num = thread_num;
-
-    conn->pool = p;
-    conn->local_addr = *saddr;
-    conn->base_server = server;
-    conn->client = inout;
-
-    conn->remote_addr = *remaddr;
-    conn->remote_ip = ap_pstrdup(conn->pool,
-                             inet_ntoa(conn->remote_addr.sin_addr));
-
-    return conn;
-}
-
 #if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)
 static void sock_disable_nagle(int s) /* ZZZ abstract */
 {
@@ -857,7 +826,7 @@ static void process_socket(pool *p, struct sockaddr *sa_client, int csd, int my_
     conn_io = ap_bcreate(p, B_RDWR);
     ap_bpush_iol(conn_io, iol);
 
-    current_conn = new_connection(p, server_conf, conn_io,
+    current_conn = ap_new_connection(p, server_conf, conn_io,
                                   (const struct sockaddr_in *) sa_client, 
                                   (const struct sockaddr_in *) &sa_server, 
                                   my_child_num, my_thread_num);

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 6a84f596f2ec38bc76b81bef91982036f7552b0d..0d61eb90cd7cd5891ed0f35b4dabfab9d1c970a1 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -2326,7 +2326,7 @@ static void child_main(int child_num_arg)
        current_conn = ap_new_connection(ptrans, server_conf, conn_io,
                                         (struct sockaddr_in *) &sa_client,
                                         (struct sockaddr_in *) &sa_server,
-                                        my_child_num);
+                                        my_child_num, 0);
 
        ap_process_connection(current_conn);
     }