Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 1 Aug 2000 20:25:57 -0000
Message-ID: <20000801202557.86750.qmail@locus.apache.org>
From: rbb@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/modules/mpm/perchild perchild.c

rbb         00/08/01 13:25:56

  Modified:    src/modules/mpm/perchild perchild.c
  Log:
  This serves requests again, although it still doesn't forward requests off
  to the correct socket yet.
  
  Revision  Changes    Path
  1.12      +10 -6     apache-2.0/src/modules/mpm/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/perchild/perchild.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- perchild.c	2000/08/01 18:58:19	1.11
  +++ perchild.c	2000/08/01 20:25:56	1.12
  @@ -557,8 +557,9 @@
       ap_create_pool(&ptrans, tpool);
   
       ap_setup_poll(&pollset, num_listenfds+1, tpool);
  -    for(n=0 ; n <= num_listenfds ; ++n)
  +    for(n=0 ; n <= num_listenfds ; ++n) {
           ap_add_poll_socket(pollset, listenfds[n], APR_POLLIN);
  +    }
   
       while (!workers_may_exit) {
           workers_may_exit |= (max_requests_per_child != 0) && (requests_this_child <= 0);
  @@ -833,7 +834,6 @@
       int i;
       ap_listen_rec *lr;
       ap_status_t rv;
  -    int sd;
   
       my_pid = getpid();
       child_num = child_num_arg;
  @@ -883,8 +883,10 @@
   #if APR_FILES_AS_SOCKETS
       ap_socket_from_file(&listenfds[0], pipe_of_death_in);
   #endif
  +
       /* The child socket */
  -    ap_put_os_sock(&listenfds[1], &sd, pchild);
  +    ap_put_os_sock(&listenfds[1], &child_info_table[child_num].sd, pchild);
  +
       num_listenfds++;
       for (lr = ap_listeners, i = 2; i <= num_listenfds; lr = lr->next, ++i)
           listenfds[i]=lr->sd;
  @@ -1394,17 +1396,19 @@
       int num;
   
   fprintf(stderr, "In perchild_post_read\n");
  +    fflush(stderr);
       process_num = ap_hash_get(socket_info_table, hostname, 0);
       if (process_num) {
           num = atoi(process_num);
       }
       else {
  -        num = -1;
  +        num = socket_num;
       }
   
  -    if (num != child_num) {
  +    if (num != child_info_table[child_num].num) {
           /* package the request and send it to another child */
  -fprintf(stderr, "leaving DECLINED\n");
  +fprintf(stderr, "leaving DECLINED %d %d\n", num, child_num);
  +    fflush(stderr);
           return DECLINED;
       }
       return OK;