jerenkrantz 2002/07/15 22:50:40
Modified: buckets apr_buckets_pipe.c apr_buckets_socket.c
Log:
Revert rev 1.42 of apr_buckets_socket.c and rev 1.52 of apr_buckets_pipe.c
APR_NONBLOCK_READ means that we have no timeout - i.e. that we read
immediately. Leaving the timeout set by the 'upstream' application is
incorrect in this state.
This fixes httpd-2.0 blocking in check_pipeline_flush() for EATCRLF modes.
Revision Changes Path
1.53 +1 -6 apr-util/buckets/apr_buckets_pipe.c
Index: apr_buckets_pipe.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_pipe.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- apr_buckets_pipe.c 12 Jul 2002 19:29:12 -0000 1.52
+++ apr_buckets_pipe.c 16 Jul 2002 05:50:39 -0000 1.53
@@ -64,12 +64,7 @@
if (block == APR_NONBLOCK_READ) {
apr_file_pipe_timeout_get(p, &timeout);
- /* Only mess with the timeout if we are in a blocking state
- * otherwise we are already nonblocking so don't worry about it.
- */
- if (timeout < 0) {
- apr_file_pipe_timeout_set(p, 0);
- }
+ apr_file_pipe_timeout_set(p, 0);
}
*str = NULL;
1.43 +1 -6 apr-util/buckets/apr_buckets_socket.c
Index: apr_buckets_socket.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_socket.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- apr_buckets_socket.c 15 Jul 2002 22:18:06 -0000 1.42
+++ apr_buckets_socket.c 16 Jul 2002 05:50:39 -0000 1.43
@@ -64,12 +64,7 @@
if (block == APR_NONBLOCK_READ) {
apr_socket_timeout_get(p, &timeout);
- /* Only mess with the timeout if we are in a blocking state
- * otherwise we are already nonblocking so don't worry about it.
- */
- if (timeout < 0) {
- apr_socket_timeout_set(p, 0);
- }
+ apr_socket_timeout_set(p, 0);
}
*str = NULL;
