www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Clean up some timeout arg warnings

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87006 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2000-11-18 14:43:26 +00:00
parent a34aea5fa1
commit a1346d5f95
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/http/http_protocol.c
View File

@@ -1413,9 +1413,9 @@ request_rec *ap_read_request(conn_rec *conn)
r->input_filters = conn->input_filters; r->input_filters = conn->input_filters;
apr_setsocketopt(conn->client_socket, APR_SO_TIMEOUT, apr_setsocketopt(conn->client_socket, APR_SO_TIMEOUT,
conn->keptalive (int)(conn->keptalive
? r->server->keep_alive_timeout * APR_USEC_PER_SEC ? r->server->keep_alive_timeout * APR_USEC_PER_SEC
: r->server->timeout * APR_USEC_PER_SEC); : r->server->timeout * APR_USEC_PER_SEC));
ap_add_output_filter("BYTERANGE", NULL, r, r->connection); ap_add_output_filter("BYTERANGE", NULL, r, r->connection);
ap_add_output_filter("CONTENT_LENGTH", NULL, r, r->connection); ap_add_output_filter("CONTENT_LENGTH", NULL, r, r->connection);
@@ -1434,7 +1434,7 @@ request_rec *ap_read_request(conn_rec *conn)
} }
if (r->connection->keptalive) { if (r->connection->keptalive) {
apr_setsocketopt(r->connection->client_socket, APR_SO_TIMEOUT, apr_setsocketopt(r->connection->client_socket, APR_SO_TIMEOUT,
r->server->timeout * APR_USEC_PER_SEC); (int)(r->server->timeout * APR_USEC_PER_SEC));
} }
if (!r->assbackwards) { if (!r->assbackwards) {
get_mime_headers(r); get_mime_headers(r);

2
server/connection.c
View File

@@ -208,7 +208,7 @@ void ap_lingering_close(conn_rec *c)
if (timeout >= MAX_SECS_TO_LINGER) break; if (timeout >= MAX_SECS_TO_LINGER) break;
/* figure out the new timeout */ /* figure out the new timeout */
timeout = (MAX_SECS_TO_LINGER - timeout) * APR_USEC_PER_SEC; timeout = (int)((MAX_SECS_TO_LINGER - timeout) * APR_USEC_PER_SEC);
} }
apr_close_socket(c->client_socket); apr_close_socket(c->client_socket);