fielding 97/05/28 23:23:37
Modified: src/modules/proxy proxy_util.c Log: Until someone has time to create a proxy-specific timeout handler, we need to use hard_timeout any time we are simultaneously reading from one blockable buffer and writing to another. Revision Changes Path 1.15 +6 -1 apache/src/modules/proxy/proxy_util.c Index: proxy_util.c =================================================================== RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_util.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C3 -r1.14 -r1.15 *** proxy_util.c 1997/05/27 08:00:48 1.14 --- proxy_util.c 1997/05/29 06:23:36 1.15 *************** *** 392,398 **** conn_rec *con = r->connection; total_bytes_sent = 0; ! soft_timeout("proxy send body", r); while (!con->aborted) { n = bread(f, buf, IOBUFSIZE); --- 392,403 ---- conn_rec *con = r->connection; total_bytes_sent = 0; ! ! /* Since we are reading from one buffer and writing to another, ! * it is unsafe to do a soft_timeout here, at least until the proxy ! * has its own timeout handler which can set both buffers to EOUT. ! */ ! hard_timeout("proxy send body", r); while (!con->aborted) { n = bread(f, buf, IOBUFSIZE);