httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/prefork prefork.c
Date Thu, 22 Jun 2000 22:49:53 GMT
rbb         00/06/22 15:49:52

  Modified:    src      configure.in
               src/include ap_config.h
               src/modules/mpm/prefork prefork.c
  Log:
  Remove select checks from Apache config.  These checks were used to define
  ap_select in ap_config.h.  The only file that used ap_select() was
  prefork.c.  I have modified prefork.c to use select instead of ap_select.
  In the future, this should be modified to use ap_poll like the rest of the
  Unix MPMs.  There are other MPMs that are continuing to use select, but this
  too should change in time.
  
  Revision  Changes    Path
  1.62      +0 -11     apache-2.0/src/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/configure.in,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- configure.in	2000/06/21 13:15:25	1.61
  +++ configure.in	2000/06/22 22:49:46	1.62
  @@ -106,17 +106,6 @@
   
   APACHE_EBCDIC
   
  -AC_FUNC_SELECT_ARGTYPES
  -
  -dnl Check if we'll actually need to cast select args all the time
  -if test "$ac_cv_func_select_arg1" != "int" \
  -        -o "$ac_cv_func_select_arg234" != "fd_set *" \
  -        -o "$ac_cv_func_select_arg5" != "struct timeval *" ; then
  -
  -    AC_DEFINE(SELECT_NEEDS_CAST,,
  -        [Define if arguments to select() aren't what we expect])
  -fi
  -
   AC_ARG_WITH(optim,[  --with-optim="FLAGS"      compiler optimisation flags],
           [OPTIM="$withval"])
   
  
  
  
  1.38      +0 -10     apache-2.0/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- ap_config.h	2000/06/19 00:45:39	1.37
  +++ ap_config.h	2000/06/22 22:49:49	1.38
  @@ -103,16 +103,6 @@
   /* ap_ versions of ctype macros to make sure they deal with 8-bit chars */
   #include "ap_ctype.h"
   
  -/* XXX - This probably doesn't handle OS/2 */
  -#ifdef SELECT_NEEDS_CAST
  -#define ap_select(_a, _b, _c, _d, _e)   \
  -    select((SELECT_TYPE_ARG1)(_a), (SELECT_TYPE_ARG234)(_b), \
  -           (SELECT_TYPE_ARG234)(_c), (SELECT_TYPE_ARG234)(_d), \
  -           (SELECT_TYPE_ARG5)(_e))
  -#else
  -#define ap_select(_a, _b, _c, _d, _e) select(_a, _b, _c, _d, _e)
  -#endif
  -
   #ifdef SIGWAIT_TAKES_ONE_ARG
   #define ap_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0)
   #else
  
  
  
  1.106     +1 -1      apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- prefork.c	2000/06/22 00:28:33	1.105
  +++ prefork.c	2000/06/22 22:49:50	1.106
  @@ -834,7 +834,7 @@
   	    if (ap_listeners->next) {
   		/* more than one socket */
   		memcpy(&main_fds, &listenfds, sizeof(fd_set));
  -		srv = ap_select(listenmaxfd + 1, &main_fds, NULL, NULL, NULL);
  +		srv = select(listenmaxfd + 1, &main_fds, NULL, NULL, NULL);
   
   		if (srv < 0 && errno != EINTR) {
   		    /* Single Unix documents select as returning errnos
  
  
  

Mime
View raw message