httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt child.c
Date Mon, 08 Mar 2004 23:33:03 GMT
jerenkrantz    2004/03/08 15:33:03

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES
               server/mpm/winnt Tag: APACHE_2_0_BRANCH child.c
  Log:
  Win32: find_read_listeners was not correctly handling multiple listeners on the
  Win32DisableAcceptEx path
  
  Reviewed by:	stoddard, trawick, ake
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.254 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.253
  retrieving revision 1.988.2.254
  diff -u -u -r1.988.2.253 -r1.988.2.254
  --- CHANGES	8 Mar 2004 23:29:10 -0000	1.988.2.253
  +++ CHANGES	8 Mar 2004 23:33:02 -0000	1.988.2.254
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.49
   
  +  *) Win32: find_read_listeners was not correctly handling multiple
  +     listeners on the Win32DisableAcceptEx path.  [Bill Stoddard]
  +
     *) Fix bug in mod_usertrack when no CookieName is set.  PR 24483.
        [Manni Wood <manniwood planet-save.com>]
   
  
  
  
  No                   revision
  No                   revision
  1.9.2.14  +15 -8     httpd-2.0/server/mpm/winnt/child.c
  
  Index: child.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/child.c,v
  retrieving revision 1.9.2.13
  retrieving revision 1.9.2.14
  diff -u -u -r1.9.2.13 -r1.9.2.14
  --- child.c	4 Mar 2004 20:12:47 -0000	1.9.2.13
  +++ child.c	8 Mar 2004 23:33:03 -0000	1.9.2.14
  @@ -205,16 +205,21 @@
       ap_listen_rec *lr;
       SOCKET nsd;
   
  -    for (lr = head_listener; lr ; lr = lr->next) {
  +    lr = head_listener;
  +    do {
           apr_os_sock_get(&nsd, lr->sd);
  -	if (FD_ISSET(nsd, main_fds)) {
  -	    head_listener = lr->next;
  -            if (head_listener == NULL)
  +        if (FD_ISSET(nsd, main_fds)) {
  +            head_listener = lr->next;
  +            if (!head_listener) {
                   head_listener = ap_listeners;
  -
  -	    return (lr);
  -	}
  -    }
  +            }
  +            return lr;
  +        }
  +        lr = lr->next;
  +        if (!lr) {
  +            lr = ap_listeners;
  +        }
  +    } while (lr != head_listener);
       return NULL;
   }
   
  @@ -332,6 +337,8 @@
               if (listenmaxfd == INVALID_SOCKET || nsd > listenmaxfd) {
                   listenmaxfd = nsd;
               }
  +            ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf,
  +                         "Child %d: Listening on port %d.", my_pid, lr->bind_addr->port);
           }
       }
   
  
  
  

Mime
View raw message