dgaudet 99/06/19 13:40:18
Modified: mpm/src/include ap_iol.h
mpm/src/main iol_unix.c
Log:
use ETIMEDOUT instead of ETIME
Revision Changes Path
1.2 +1 -1 apache-2.0/mpm/src/include/ap_iol.h
Index: ap_iol.h
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/src/include/ap_iol.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap_iol.h 1999/06/18 23:34:57 1.1
+++ ap_iol.h 1999/06/19 20:40:16 1.2
@@ -80,7 +80,7 @@
If the timeout is positive, they will block up to the specified number
of seconds. If the read/write can't be completed in that time,
- a -1 will be returned and errno will be set to ETIME.
+ a -1 will be returned and errno will be set to ETIMEDOUT.
TODO: we've all agreed errno is somewhat evil, and it must be replaced
by a status result code. I'll leave that to someone else.
1.4 +1 -5 apache-2.0/mpm/src/main/iol_unix.c
Index: iol_unix.c
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/src/main/iol_unix.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iol_unix.c 1999/06/19 20:23:37 1.3
+++ iol_unix.c 1999/06/19 20:40:17 1.4
@@ -63,10 +63,6 @@
#include <sys/types.h>
#include <sys/uio.h>
-#ifndef ETIME
-# define ETIME -1
-#endif
-
#define FD_NONBLOCKING_SET (1)
typedef struct {
@@ -146,7 +142,7 @@
rv = select(fd->fd + 1, selread, selwrite, NULL, fd->timeout < 0 ?
NULL : &tv); \
} while (rv == -1 && errno == EINTR); \
if (!FD_ISSET(fd->fd, &fdset)) { \
- errno = ETIME; \
+ errno = ETIMEDOUT; \
return -1; \
} \
do { \
