httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/prefork prefork.c
Date Sun, 11 Nov 2001 04:37:11 GMT
trawick     01/11/10 20:37:11

  Modified:    server/mpm/prefork prefork.c
  Log:
  in prefork, listensocks[0] doesn't have a pod
  
  also, fix an ap_log_error() call to use ret for the error code
  instead of errno
  
  Revision  Changes    Path
  1.210     +3 -3      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.209
  retrieving revision 1.210
  diff -u -r1.209 -r1.210
  --- prefork.c	2001/11/10 18:26:29	1.209
  +++ prefork.c	2001/11/11 04:37:11	1.210
  @@ -624,7 +624,7 @@
       	         * on Linux 2.0.x we seem to end up with EFAULT
       	         * occasionally, and we'd loop forever due to it.
       	         */
  -    	        ap_log_error(APLOG_MARK, APLOG_ERR, errno, ap_server_conf,
  +    	        ap_log_error(APLOG_MARK, APLOG_ERR, ret, ap_server_conf,
                                "apr_poll: (listen)");
       	        clean_child_exit(1);
               }
  @@ -637,8 +637,8 @@
                   curr_pollfd = last_pollfd;
                   do {
                       curr_pollfd++;
  -                    if (curr_pollfd > num_listensocks) {
  -                        curr_pollfd = 1;
  +                    if (curr_pollfd >= num_listensocks) {
  +                        curr_pollfd = 0;
                       }
                       /* XXX: Should we check for POLLERR? */
                       apr_poll_revents_get(&event, listensocks[curr_pollfd], pollset);
  
  
  

Mime
View raw message