cvs commit: apache-2.0/mpm/src/modules/mpm/prefork prefork.c

[ben]

ben         99/07/25 07:03:17

  Modified:    mpm/src/modules/mpm/prefork prefork.c
  Log:
  Make sure we terminate.
  
  Revision  Changes    Path
  1.18      +7 -3      apache-2.0/mpm/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- prefork.c 1999/07/25 13:58:58     1.17
  +++ prefork.c 1999/07/25 14:03:16     1.18
  @@ -2160,17 +2160,21 @@
                }
                else {
                    lr = last_lr->next;
  +                 if (!lr)
  +                     lr = ap_listeners;
                }
                first_lr=lr;
                do {
  -                 if (!lr) {
  -                     lr = ap_listeners;
  -                 }
                    if (FD_ISSET(lr->fd, &main_fds))
                        goto got_listener;
                    lr = lr->next;
  +                 if (!lr)
  +                     lr = ap_listeners;
                }
                while (lr != first_lr);
  +             /* FIXME: if we get here, something bad has happened, and we're
  +                probably gonna spin forever.
  +             */
                continue;
        got_listener:
                last_lr = lr;