You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/10/08 08:08:58 UTC
cvs commit: apache-2.0/src/main buff.c http_protocol.c
wrowe 00/10/07 23:08:58
Modified: src/main buff.c http_protocol.c
Log:
That's all I wrote... except for the mpm_winnt.c canonical error patch,
my development tree is up-to-date.
Revision Changes Path
1.64 +2 -2 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.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- buff.c 2000/10/05 17:32:49 1.63
+++ buff.c 2000/10/08 06:08:58 1.64
@@ -364,7 +364,7 @@
do {
*bytes_read = nbyte;
rv = apr_recv(fb->bsock, buf, bytes_read);
- } while (rv == APR_EINTR && !(fb->flags & B_EOUT));
+ } while (APR_STATUS_IS_EINTR(rv) && !(fb->flags & B_EOUT));
apr_setsocketopt(fb->bsock, APR_SO_TIMEOUT, timeout);
/* treat any error as if it would block as well */
@@ -411,7 +411,7 @@
do {
*bytes_read = nbyte;
rv = apr_recv(fb->bsock, buf, bytes_read);
- } while (rv == EINTR && !(fb->flags &B_EOUT));
+ } while (APR_STATUS_IS_EINTR(rv) && !(fb->flags &B_EOUT));
}
if (rv == APR_SUCCESS && *bytes_read == 0) {
fb->flags |= B_EOF;
1.151 +1 -1 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- http_protocol.c 2000/10/08 04:25:11 1.150
+++ http_protocol.c 2000/10/08 06:08:58 1.151
@@ -2749,7 +2749,7 @@
do {
rv = apr_read(fd, buf, &n);
- } while (rv == APR_EINTR && !r->connection->aborted);
+ } while (APR_STATUS_IS_EINTR(rv) && !r->connection->aborted);
/* Is this still the right check? maybe check for n==0 or rv == APR_EOF? */
if (n < 1) {