From 2bc99dc33d52adf7dae9a5cd49e5b1025f1d34f5 Mon Sep 17 00:00:00 2001 From: Manoj Kasichainula Date: Thu, 5 Aug 1999 19:56:24 +0000 Subject: [PATCH] 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 --- include/http_connection.h | 3 +-- server/connection.c | 6 +----- server/mpm/dexter/dexter.c | 3 +-- server/mpm/mpmt_pthread/mpmt_pthread.c | 3 +-- server/mpm/prefork/prefork.c | 3 +-- server/mpm/spmt_os2/spmt_os2.c | 3 +-- 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/include/http_connection.h b/include/http_connection.h index cb5a04d486..2dfa31be58 100644 --- 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 1950069dc7..ed81e446c0 100644 --- 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 dc01001b76..3046bdf345 100644 --- 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 cb390a6182..60ce966d64 100644 --- 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 9cced01ce7..1832a7bca3 100644 --- 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 2b335ae606..a32a802a1d 100644 --- 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); } -- 2.50.1