From 906a993109d5837ee046e23dd3c398a770726472 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Wed, 1 Nov 2000 15:44:42 +0000 Subject: [PATCH] Get rid of a couple of buff calls by manipulating the APR socket timeout directly. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86786 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http/http_protocol.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index 43d4154675..61958372a7 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -1396,11 +1396,11 @@ request_rec *ap_read_request(conn_rec *conn) r->output_filters = conn->output_filters; r->input_filters = conn->input_filters; - ap_bsetopt(conn->client, BO_TIMEOUT, - conn->keptalive - ? &r->server->keep_alive_timeout - : &r->server->timeout); - + apr_setsocketopt(conn->client_socket, APR_SO_TIMEOUT, + conn->keptalive + ? r->server->keep_alive_timeout * APR_USEC_PER_SEC + : r->server->timeout * APR_USEC_PER_SEC); + ap_add_output_filter("CONTENT_LENGTH", NULL, r, r->connection); ap_add_output_filter("HTTP_HEADER", NULL, r, r->connection); @@ -1416,8 +1416,8 @@ request_rec *ap_read_request(conn_rec *conn) return NULL; } if (r->connection->keptalive) { - ap_bsetopt(r->connection->client, BO_TIMEOUT, - &r->server->timeout); + apr_setsocketopt(r->connection->client_socket, APR_SO_TIMEOUT, + r->server->timeout * APR_USEC_PER_SEC); } if (!r->assbackwards) { get_mime_headers(r); -- 2.40.0