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/main buff.c
Date Mon, 12 Jun 2000 23:34:24 GMT
rbb         00/06/12 16:34:24

  Modified:    src      configure.in
               src/include ap_config.h
               src/main buff.c
  Log:
  Remove the check for EAGAIN.  With APR handling the error codes, this is
  no longer an issue that Apache needs to deal with.
  
  Revision  Changes    Path
  1.59      +0 -4      apache-2.0/src/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/configure.in,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- configure.in	2000/06/12 16:31:54	1.58
  +++ configure.in	2000/06/12 23:34:23	1.59
  @@ -83,10 +83,6 @@
   )
   AC_HEADER_SYS_WAIT
   
  -dnl ## Check for C preprocessor symbols
  -
  -AC_CHECK_DEFINE(EAGAIN, errno.h)
  -
   dnl ## Check for typedefs, structures, and compiler characteristics.
   
   AC_C_CONST
  
  
  
  1.36      +0 -5      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.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ap_config.h	2000/06/12 21:46:35	1.35
  +++ ap_config.h	2000/06/12 23:34:23	1.36
  @@ -124,11 +124,6 @@
   #define ap_sigwait(a,b) sigwait((a),(b))
   #endif
   
  -/* EAGAIN apparently isn't defined on some systems */
  -#if !defined(HAVE_EAGAIN) && !defined(EAGAIN)
  -#define EAGAIN EWOULDBLOCK
  -#endif
  -
   /*
    * String and memory functions
    */
  
  
  
  1.51      +1 -1      apache-2.0/src/main/buff.c
  
  Index: buff.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- buff.c	2000/06/12 23:02:48	1.50
  +++ buff.c	2000/06/12 23:34:24	1.51
  @@ -445,7 +445,7 @@
       /* we'll read the next packet if it's available */
       fb->inptr = fb->inbase;
       rv = saferead(fb, fb->inptr, fb->bufsiz, &fb->incnt);
  -    if (rv != APR_SUCCESS && rv != APR_EAGAIN) {
  +    if (rv != APR_SUCCESS && ap_canonical_error(rv) != APR_EAGAIN) {
   	fb->berrno = rv;
   	fb->saved_errno = rv;
   	doerror(fb, B_RD);
  
  
  

Mime
View raw message