Take child_num and thread_num out of conn_rec. They aren't used anywhere

anymore, and conn_rec is the wrong place for them.

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

diff --git a/include/http_connection.h b/include/http_connection.h
index cb5a04d48693b9102fdd3de2c9028a4745ae16ab..2dfa31be58020c5e3261ea0eb8f7fd33bc3ecc9e 100644 (file)
--- a/include/http_connection.h
+++ b/include/http_connection.h
@@ -66,8 +66,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 thread_num);
+                           const struct sockaddr_in *saddr);
 CORE_EXPORT(void) ap_process_connection(conn_rec *);
 int ap_process_http_connection(conn_rec *);
 

diff --git a/server/connection.c b/server/connection.c
index 1950069dc7a9d3fd10e6079e7e248a1a53bdc278..ed81e446c03aa5c2866d067e9ee13abc77c6ec3f 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -258,8 +258,7 @@ int ap_process_http_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 thread_num)
+                           const struct sockaddr_in *saddr)
 {
     conn_rec *conn = (conn_rec *) ap_pcalloc(p, sizeof(conn_rec));
 
@@ -269,9 +268,6 @@ 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;
     conn->base_server = server;

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index dc01001b76790e21b7ca11be86b8ea817ef9a3d4..3046bdf345f8f179bd1057b354395324f1d9e115 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -835,8 +835,7 @@ static void process_socket(pool *p, struct sockaddr *sa_client, int csd)
 
     current_conn = ap_new_connection(p, server_conf, conn_io,
                                   (const struct sockaddr_in *) sa_client, 
-                                  (const struct sockaddr_in *) &sa_server, 
-                                  0, 0);
+                                  (const struct sockaddr_in *) &sa_server);
 
     ap_process_connection(current_conn);
 }

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index cb390a6182daeb71b8259b0ac4665e6aad40007f..60ce966d64820a513859fced8e4e830e0d56eea8 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -845,8 +845,7 @@ static void process_socket(pool *p, struct sockaddr *sa_client, int csd, int my_
 
     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);
+                                  (const struct sockaddr_in *) &sa_server);
 
     ap_process_connection(current_conn);
 }

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 9cced01ce7118ce6781d7fe1f75ea1ec5d9b3127..1832a7bca3e093e2dcb4e5dfc6ce3271d2fcfad4 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -2333,8 +2333,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, 0);
+                                        (struct sockaddr_in *) &sa_server);
 
        ap_process_connection(current_conn);
     }

diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index 2b335ae606df7c2039ade5399ab79ca968ac512b..a32a802a1d431428b2306f7fb4a32e74984ba10d 100644 (file)
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -1135,8 +1135,7 @@ static void child_main(void *child_num_arg)
 
        current_conn = ap_new_connection(ptrans, server_conf, conn_io,
                                         (struct sockaddr_in *) &sa_client,
-                                        (struct sockaddr_in *) &sa_server,
-                                        THREAD_GLOBAL(child_num), 0);
+                                        (struct sockaddr_in *) &sa_server);
 
        ap_process_connection(current_conn);
     }