httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/server/mpm/perchild mpm.h perchild.c
Date Wed, 19 Dec 2001 17:50:39 GMT
rbb         01/12/19 09:50:39

  Modified:    server/mpm/perchild mpm.h perchild.c
  Log:
  This gets perchild compiling and serving pages again.  It does NOT
  pass file descriptors yet.  That is a much bigger project.
  
  Revision  Changes    Path
  1.12      +1 -1      httpd-2.0/server/mpm/perchild/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/mpm.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mpm.h	2001/12/18 13:48:53	1.11
  +++ mpm.h	2001/12/19 17:50:38	1.12
  @@ -78,7 +78,7 @@
   #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
   
   #define MPM_SYNC_CHILD_TABLE()
  -#define MPM_CHILD_PID(i) (ap_child_table[i].pid)
  +#define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
   #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)
   
   /* Table of child status */
  
  
  
  1.94      +2 -2      httpd-2.0/server/mpm/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/perchild.c,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- perchild.c	2001/12/19 01:22:03	1.93
  +++ perchild.c	2001/12/19 17:50:38	1.94
  @@ -1452,7 +1452,7 @@
   
   static int pass_request(request_rec *r)
   {
  -    apr_socket_t *thesock = r->connection->client_socket;
  +    apr_socket_t *thesock = ap_get_module_config(r->connection->conn_config, &core_module);
       struct msghdr msg;
       struct cmsghdr *cmsg;
       int sfd;
  @@ -1582,7 +1582,7 @@
           apr_os_sock_put(&csd, &thread_socket_table[thread_num], 
                           r->connection->pool);
           ap_sock_disable_nagle(csd);
  -        r->connection->client_socket = csd;
  +        ap_set_module_config(r->connection->conn_config, &core_module, csd);
           return OK;
       }
       else {
  
  
  

Mime
View raw message