Cleanup proxy timeouts a bit to remove emits and make consistent to

  vhost timeout.


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

4 files changed, 7 insertions, 7 deletions

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 5e5fabfab8..ec7899ec67 100644
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -194,8 +194,8 @@ typedef struct {
     int error_override_set;
     int preserve_host;
     int preserve_host_set;
-    int timeout;
-    int timeout_set;
+    apr_interval_time_t timeout;
+    apr_interval_time_t timeout_set;
 
 } proxy_server_conf;
 
diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index 4bbcaf679e..fcd2fbd0f4 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -968,11 +968,11 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
 
     /* Set a timeout on the socket */
     if (conf->timeout_set == 1) {
-        apr_setsocketopt(sock, APR_SO_TIMEOUT, conf->timeout);
+        apr_setsocketopt(sock, APR_SO_TIMEOUT, (int)conf->timeout);
     }
     else {
         apr_setsocketopt(sock, 
-                         APR_SO_TIMEOUT, r->server->timeout);
+                         APR_SO_TIMEOUT, (int)r->server->timeout);
     }
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index 245e34bc25..b460028dd1 100644
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -319,7 +319,7 @@ apr_status_t ap_proxy_http_create_connection(apr_pool_t *p, request_rec *r,
         apr_size_t buffer_len = 1;
         char test_buffer[1]; 
         apr_status_t socket_status;
-        apr_int32_t current_timeout;
+        apr_short_interval_time_t current_timeout;
 
         /* use previous keepalive socket */
         *origin = backend->connection;
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 94106f8c9c..0914ee1ecb 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1158,10 +1158,10 @@ PROXY_DECLARE(int) ap_proxy_connect_to_backend(apr_socket_t **newsock,
 
         /* Set a timeout on the socket */
         if (conf->timeout_set == 1) {
-            apr_setsocketopt(*newsock, APR_SO_TIMEOUT, conf->timeout);
+            apr_setsocketopt(*newsock, APR_SO_TIMEOUT, (int)conf->timeout);
         }
         else {
-            apr_setsocketopt(*newsock, APR_SO_TIMEOUT, s->timeout);
+            apr_setsocketopt(*newsock, APR_SO_TIMEOUT, (int)s->timeout);
         }
 
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,