httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@hyperreal.org
Subject cvs commit: apache-2.0/mpm/src/modules/mpm/spmt_os2 spmt_os2.c
Date Thu, 05 Aug 1999 19:56:29 GMT
manoj       99/08/05 12:56:27

  Modified:    mpm/src/include http_connection.h httpd.h
               mpm/src/main http_connection.c
               mpm/src/modules/mpm/dexter dexter.c
               mpm/src/modules/mpm/mpmt_pthread mpmt_pthread.c
               mpm/src/modules/mpm/prefork prefork.c
               mpm/src/modules/mpm/spmt_os2 spmt_os2.c
  Log:
  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.
  
  Revision  Changes    Path
  1.6       +1 -2      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.5
  retrieving revision 1.6
  diff -u -d -u -r1.5 -r1.6
  --- http_connection.h	1999/07/22 19:17:16	1.5
  +++ http_connection.h	1999/08/05 19:56:04	1.6
  @@ -66,8 +66,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 thread_num);
  +			    const struct sockaddr_in *saddr);
   CORE_EXPORT(void) ap_process_connection(conn_rec *);
   int ap_process_http_connection(conn_rec *);
   
  
  
  
  1.10      +0 -2      apache-2.0/mpm/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/include/httpd.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -d -u -r1.9 -r1.10
  --- httpd.h	1999/07/25 14:24:00	1.9
  +++ httpd.h	1999/08/05 19:56:05	1.10
  @@ -789,8 +789,6 @@
   
       /* Information about the connection itself */
   
  -    int child_num;		/* The number of the child handling conn_rec */
  -    int thread_num;             /* number of the thread handling conn_rec */
       BUFF *client;		/* Connection to the guy */
   
       /* Who is the client? */
  
  
  
  1.15      +1 -5      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.14
  retrieving revision 1.15
  diff -u -d -u -r1.14 -r1.15
  --- http_connection.c	1999/07/31 09:31:21	1.14
  +++ http_connection.c	1999/08/05 19:56:12	1.15
  @@ -258,8 +258,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 thread_num)
  +			    const struct sockaddr_in *saddr)
   {
       conn_rec *conn = (conn_rec *) ap_pcalloc(p, sizeof(conn_rec));
   
  @@ -268,9 +267,6 @@
        */
   
       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.18      +1 -2      apache-2.0/mpm/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -d -u -r1.17 -r1.18
  --- dexter.c	1999/08/04 00:21:32	1.17
  +++ dexter.c	1999/08/05 19:56:15	1.18
  @@ -835,8 +835,7 @@
   
       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);
   }
  
  
  
  1.23      +1 -2      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.22
  retrieving revision 1.23
  diff -u -d -u -r1.22 -r1.23
  --- mpmt_pthread.c	1999/08/04 00:21:35	1.22
  +++ mpmt_pthread.c	1999/08/05 19:56:19	1.23
  @@ -845,8 +845,7 @@
   
       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);
   }
  
  
  
  1.24      +1 -2      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.23
  retrieving revision 1.24
  diff -u -d -u -r1.23 -r1.24
  --- prefork.c	1999/08/01 14:43:24	1.23
  +++ prefork.c	1999/08/05 19:56:22	1.24
  @@ -2333,8 +2333,7 @@
   
   	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);
       }
  
  
  
  1.8       +1 -2      apache-2.0/mpm/src/modules/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -d -u -r1.7 -r1.8
  --- spmt_os2.c	1999/08/03 23:39:11	1.7
  +++ spmt_os2.c	1999/08/05 19:56:24	1.8
  @@ -1135,8 +1135,7 @@
   
   	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);
       }
  
  
  

Mime
View raw message