[PATCH] proxy_http.c

From: <barbee(at)veribox.net>
Date: Thu Aug 16 2001 - 12:47:31 EDT

fixed a FIXME that checks to see if an old connection has been closed or not.

barbee.

Index: modules/proxy/proxy_http.c

---

RCS file: /home/cvspublic/httpd-proxy/module-2.0/proxy_http.c,v retrieving revision 1.89

diff -u -a -r1.89 proxy_http.c
--- modules/proxy/proxy_http.c	2001/08/15 18:36:05	1.89
+++ modules/proxy/proxy_http.c	2001/08/16 23:37:40
@@ -309,6 +309,10 @@
     /* get a socket - either a keepalive one, or a new one */
     new = 1;
     if ((backend->connection) && (backend->connection->id == c->id)) {

+        int buffer_len = 1;

+        char test_buffer[buffer_len];

+        apr_status_t socket_status;


+        apr_int32_t current_timeout;


 
         /* use previous keepalive socket */
         *origin = backend->connection;
@@ -318,8 +322,18 @@
         /* reset the connection filters */
         ap_proxy_reset_output_filters(*origin);
 
-        /* XXX FIXME: If the socket has since closed, change new to 1 so
-         * a new socket is opened */

+        /* save timeout */

+        apr_getsocketopt(p_conn->sock, APR_SO_TIMEOUT, &current_timeout);

+        /* set no timeout */

+        apr_setsocketopt(p_conn->sock, APR_SO_TIMEOUT, 0);


     }
     if (new) {

Received on Thu Aug 16 23:45:07 2001