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

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

Browse Source 
vhost timeout.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95674 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2002-06-14 17:14:57 +00:00
parent 1f8c949443
commit 3f6aa521eb
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/proxy/mod_proxy.h
View File

@@ -194,8 +194,8 @@ typedef struct {
int error_override_set; int error_override_set;
int preserve_host; int preserve_host;
int preserve_host_set; int preserve_host_set;
int timeout; apr_interval_time_t timeout;
int timeout_set; apr_interval_time_t timeout_set;
} proxy_server_conf; } proxy_server_conf;

4
modules/proxy/proxy_ftp.c
View File

@@ -968,11 +968,11 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
/* Set a timeout on the socket */ /* Set a timeout on the socket */
if (conf->timeout_set == 1) { if (conf->timeout_set == 1) {
apr_setsocketopt(sock, APR_SO_TIMEOUT, conf->timeout); apr_setsocketopt(sock, APR_SO_TIMEOUT, (int)conf->timeout);
} }
else { else {
apr_setsocketopt(sock, 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, ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,

2
modules/proxy/proxy_http.c
View File

@@ -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; apr_size_t buffer_len = 1;
char test_buffer[1]; char test_buffer[1];
apr_status_t socket_status; apr_status_t socket_status;
apr_int32_t current_timeout; apr_short_interval_time_t current_timeout;
/* use previous keepalive socket */ /* use previous keepalive socket */
*origin = backend->connection; *origin = backend->connection;

4
modules/proxy/proxy_util.c
View File

@@ -1158,10 +1158,10 @@ PROXY_DECLARE(int) ap_proxy_connect_to_backend(apr_socket_t **newsock,
/* Set a timeout on the socket */ /* Set a timeout on the socket */
if (conf->timeout_set == 1) { if (conf->timeout_set == 1) {
apr_setsocketopt(*newsock, APR_SO_TIMEOUT, conf->timeout); apr_setsocketopt(*newsock, APR_SO_TIMEOUT, (int)conf->timeout);
} }
else { 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, ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,