trawick 00/07/06 14:25:19
Modified: src/main http_protocol.c
Log:
Fix the way that ap_rwrite() checks for an error from ap_bwrite().
A dropped connection could cause a loop in ap_send_mmap() (and probably
a few other places) because of this problem.
Revision Changes Path
1.93 +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.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- http_protocol.c 2000/07/06 15:13:28 1.92
+++ http_protocol.c 2000/07/06 21:25:19 1.93
@@ -2485,7 +2485,7 @@
/* ### should loop to avoid partial writes */
rv = ap_bwrite(r->connection->client, buf, nbyte, &n);
- if (n < 0) {
+ if (rv != APR_SUCCESS) {
check_first_conn_error(r, "rwrite", rv);
return EOF;
}
|