Clean up some timeout arg warnings

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87006 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 1a007661f532e198db41825ebb9c498ad2a1668f..f7f104c882fffd74d655a82df4d960beeb20231f 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1413,9 +1413,9 @@ request_rec *ap_read_request(conn_rec *conn)
     r->input_filters   = conn->input_filters;
 
     apr_setsocketopt(conn->client_socket, APR_SO_TIMEOUT, 
-                     conn->keptalive
+                     (int)(conn->keptalive
                      ? 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("CONTENT_LENGTH", NULL, r, r->connection);
@@ -1434,7 +1434,7 @@ request_rec *ap_read_request(conn_rec *conn)
     }
     if (r->connection->keptalive) {
         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) {
         get_mime_headers(r);

diff --git a/server/connection.c b/server/connection.c
index 6f07ec763b083998cbce7f5db77d48ab1294648c..96353d0ff0a45fa4125138b0257e16daf2f95f4e 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -208,7 +208,7 @@ void ap_lingering_close(conn_rec *c)
         if (timeout >= MAX_SECS_TO_LINGER) break;
 
         /* 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);