manoj 99/07/02 11:22:27
Modified: mpm/src/include http_connection.h mpm/src/main http_connection.c mpm/src/modules/mpm/mpmt_pthread mpmt_pthread.c mpm/src/modules/mpm/prefork prefork.c Log: Use ap_new_connection in pthread MPM. This required adding an argument to ap_new_connection for now: thread_num. Revision Changes Path 1.3 +1 -1 apache-2.0/mpm/src/include/http_connection.h Index: http_connection.h =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/include/http_connection.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -u -r1.2 -r1.3 --- http_connection.h 1999/06/29 09:00:08 1.2 +++ http_connection.h 1999/07/02 18:22:24 1.3 @@ -65,7 +65,7 @@ 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 1.6 +2 -1 apache-2.0/mpm/src/main/http_connection.c Index: http_connection.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/main/http_connection.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -u -r1.5 -r1.6 --- http_connection.c 1999/06/29 09:00:19 1.5 +++ http_connection.c 1999/07/02 18:22:25 1.6 @@ -244,7 +244,7 @@ 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->conn_config=ap_create_conn_config(p); conn->child_num = child_num; + conn->thread_num = thread_num; conn->pool = p; conn->local_addr = *saddr; 1.3 +1 -32 apache-2.0/mpm/src/modules/mpm/mpmt_pthread/mpmt_pthread.c Index: mpmt_pthread.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -u -r1.2 -r1.3 --- mpmt_pthread.c 1999/06/27 03:45:15 1.2 +++ mpmt_pthread.c 1999/07/02 18:22:26 1.3 @@ -754,37 +754,6 @@ * 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 @@ 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); 1.7 +1 -1 apache-2.0/mpm/src/modules/mpm/prefork/prefork.c Index: prefork.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/prefork/prefork.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -u -r1.6 -r1.7 --- prefork.c 1999/06/29 09:00:25 1.6 +++ prefork.c 1999/07/02 18:22:27 1.7 @@ -2326,7 +2326,7 @@ 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); }