httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From orlikow...@apache.org
Subject cvs commit: httpd-proxy/module-2.0 proxy_connect.c proxy_ftp.c proxy_http.c
Date Fri, 03 Aug 2001 18:00:38 GMT
orlikowski    01/08/03 11:00:38

  Modified:    module-2.0 proxy_connect.c proxy_ftp.c proxy_http.c
  Log:
  Add a timeout when making connections from within the proxy.
  Now, if someone wants to add a special scoreboard state for proxy
  attempting to make connection, be my guest.
  
  Revision  Changes    Path
  1.49      +3 -0      httpd-proxy/module-2.0/proxy_connect.c
  
  Index: proxy_connect.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_connect.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- proxy_connect.c	2001/07/18 20:35:13	1.48
  +++ proxy_connect.c	2001/08/03 18:00:38	1.49
  @@ -222,6 +222,9 @@
           return HTTP_INTERNAL_SERVER_ERROR;
       }
   
  +    /* Set a timeout on the socket */
  +    apr_setsocketopt(sock, APR_SO_TIMEOUT, (int)(r->server->timeout * APR_USEC_PER_SEC));
  +
   	/*
   	 * At this point we have a list of one or more IP addresses of
   	 * the machine to connect to. If configured, reorder this
  
  
  
  1.77      +3 -0      httpd-proxy/module-2.0/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_ftp.c,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- proxy_ftp.c	2001/08/03 16:25:10	1.76
  +++ proxy_ftp.c	2001/08/03 18:00:38	1.77
  @@ -696,6 +696,9 @@
   #endif /*_OSD_POSIX*/
       }
   
  +    /* Set a timeout on the socket */
  +    apr_setsocketopt(sock, APR_SO_TIMEOUT, (int)(r->server->timeout * APR_USEC_PER_SEC));
  +
       ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
   		 "proxy: FTP: socket has been created");
   
  
  
  
  1.84      +3 -0      httpd-proxy/module-2.0/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_http.c,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- proxy_http.c	2001/08/03 16:25:10	1.83
  +++ proxy_http.c	2001/08/03 18:00:38	1.84
  @@ -377,6 +377,9 @@
   	}
   #endif
   
  +        /* Set a timeout on the socket */
  +        apr_setsocketopt(sock, APR_SO_TIMEOUT, (int)(r->server->timeout * APR_USEC_PER_SEC));
  +
   	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
   		     "proxy: socket has been created");
   
  
  
  

Mime
View raw message