From 2932ba2acdcef52e13bc39da30fab28578f5176e Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Tue, 24 Oct 2000 16:28:53 +0000 Subject: [PATCH] The request body should be read with the normal send/receive timeout instead of in non-blocking mode. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86734 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http/http_protocol.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index d92d5660d7..32b17db933 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -2506,7 +2506,6 @@ AP_DECLARE(long) ap_get_client_block(request_rec *r, char *buffer, int bufsiz) { apr_ssize_t len_read, total; apr_status_t rv; - apr_int32_t timeout; ap_bucket *b, *old; const char *tempbuf; core_request_config *req_cfg = @@ -2516,18 +2515,14 @@ AP_DECLARE(long) ap_get_client_block(request_rec *r, char *buffer, int bufsiz) do { if (AP_BRIGADE_EMPTY(bb)) { - apr_getsocketopt(r->connection->client_socket, APR_SO_TIMEOUT, &timeout); - apr_setsocketopt(r->connection->client_socket, APR_SO_TIMEOUT, 0); - if (ap_get_brigade(r->input_filters, bb, 9999) != APR_SUCCESS) { + if (ap_get_brigade(r->input_filters, bb, AP_MODE_BLOCKING) != APR_SUCCESS) { /* if we actually fail here, we want to just return and * stop trying to read data from the client. */ - apr_setsocketopt(r->connection->client_socket, APR_SO_TIMEOUT, timeout); r->connection->keepalive = -1; ap_brigade_destroy(bb); return -1; } - apr_setsocketopt(r->connection->client_socket, APR_SO_TIMEOUT, timeout); } b = AP_BRIGADE_FIRST(bb); } while (AP_BRIGADE_EMPTY(bb)); -- 2.40.0