httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy mod_proxy.h proxy_ftp.c proxy_http.c proxy_util.c
Date Fri, 14 Jun 2002 17:14:58 GMT
wrowe       2002/06/14 10:14:58

  Modified:    modules/proxy mod_proxy.h proxy_ftp.c proxy_http.c
                        proxy_util.c
  Log:
    Cleanup proxy timeouts a bit to remove emits and make consistent to
    vhost timeout.
  
  Revision  Changes    Path
  1.82      +2 -2      httpd-2.0/modules/proxy/mod_proxy.h
  
  Index: mod_proxy.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.h,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- mod_proxy.h	26 Apr 2002 12:29:38 -0000	1.81
  +++ mod_proxy.h	14 Jun 2002 17:14:57 -0000	1.82
  @@ -194,8 +194,8 @@
       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;
   
  
  
  
  1.122     +2 -2      httpd-2.0/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- proxy_ftp.c	12 Jun 2002 23:59:31 -0000	1.121
  +++ proxy_ftp.c	14 Jun 2002 17:14:57 -0000	1.122
  @@ -968,11 +968,11 @@
   
       /* 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,
  
  
  
  1.153     +1 -1      httpd-2.0/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_http.c,v
  retrieving revision 1.152
  retrieving revision 1.153
  diff -u -r1.152 -r1.153
  --- proxy_http.c	31 May 2002 21:21:10 -0000	1.152
  +++ proxy_http.c	14 Jun 2002 17:14:57 -0000	1.153
  @@ -319,7 +319,7 @@
           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;
  
  
  
  1.93      +2 -2      httpd-2.0/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_util.c,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- proxy_util.c	12 Jun 2002 23:59:31 -0000	1.92
  +++ proxy_util.c	14 Jun 2002 17:14:57 -0000	1.93
  @@ -1158,10 +1158,10 @@
   
           /* 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,
  
  
  

Mime
View raw message