Fix the timeout logic that I broke last week. This adds a request

level filter that sets the timeout on the socket that is connected
to the client.

Thanks Greg Stein for seeing this bug.

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

diff --git a/include/httpd.h b/include/httpd.h
index 45120988dccb9d29d6645fbc4f2957538bfb1b0c..fab85b3a5f4ffda9caf1299b1a267bcdfd8986d1 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1064,7 +1064,6 @@ typedef struct core_output_filter_ctx {
  
 typedef struct core_filter_ctx {
     apr_bucket_brigade *b;
-    int first_line;
 } core_ctx_t;
  
 typedef struct core_net_rec {

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index a81687bb8241206af53598cd63aa130f37045d7d..5392d13d78e9804a6ae9a56638182e73a0e2e94d 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -275,6 +275,7 @@ static int ap_process_http_connection(conn_rec *c)
     ap_update_child_status(AP_CHILD_THREAD_FROM_ID(c->id), SERVER_BUSY_READ, NULL);
     while ((r = ap_read_request(c)) != NULL) {
  
+        c->keepalive = 0;
         /* process the request if it was read without error */
  
         ap_update_child_status(AP_CHILD_THREAD_FROM_ID(c->id), SERVER_BUSY_WRITE, r);

diff --git a/server/core.c b/server/core.c
index 3b461c6f6911c039d323876418b931c5a6abf1ef..779001a79a5ddb4403d306ea532a53c1197cf8f7 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -2780,6 +2780,35 @@ static int default_handler(request_rec *r)
     return ap_pass_brigade(r->output_filters, bb);
 }
 
+static int net_time_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode, apr_off_t *readbytes)
+{
+    int keptalive = f->c->keepalive == 1;
+    apr_socket_t *csd = ap_get_module_config(f->c->conn_config, &core_module);
+    int *first_line = f->ctx;
+
+    if (!f->ctx) {
+        f->ctx = first_line = apr_palloc(f->r->pool, sizeof(*first_line));
+        *first_line = 1;
+    }
+
+    if (mode != AP_MODE_INIT && mode != AP_MODE_PEEK) {
+        if (*first_line) {
+            apr_setsocketopt(csd, APR_SO_TIMEOUT,
+                             (int)(keptalive
+                      ? f->c->base_server->keep_alive_timeout * APR_USEC_PER_SEC
+                      : f->c->base_server->timeout * APR_USEC_PER_SEC));
+            *first_line = 0;
+        }
+        else {
+            if (keptalive) {
+                apr_setsocketopt(csd, APR_SO_TIMEOUT,
+                         (int)(f->c->base_server->timeout * APR_USEC_PER_SEC));
+            }
+        }
+    }
+    return ap_get_brigade(f->next, b, mode, readbytes);
+}
+
 static int core_input_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode, apr_off_t *readbytes)
 {
     apr_bucket *e;
@@ -2788,7 +2817,6 @@ static int core_input_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mod
     core_ctx_t *ctx = net->in_ctx;
     const char *str;
     apr_size_t len;
-    int keptalive = f->c->keepalive == 1;
 
     if (mode == AP_MODE_INIT) {
         /*
@@ -2813,21 +2841,6 @@ static int core_input_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mod
         e = apr_bucket_socket_create(net->client_socket);
         APR_BRIGADE_INSERT_TAIL(ctx->b, e);
         net->in_ctx = ctx;
-        ctx->first_line = 1;
-    }
-
-    if (ctx->first_line) {
-        apr_setsocketopt(net->client_socket, APR_SO_TIMEOUT,
-                         (int)(keptalive
-                         ? f->c->base_server->keep_alive_timeout * APR_USEC_PER_SEC
-                         : f->c->base_server->timeout * APR_USEC_PER_SEC));
-        ctx->first_line = 0;
-    }
-    else {
-        if (keptalive) {
-            apr_setsocketopt(net->client_socket, APR_SO_TIMEOUT,
-                             (int)(f->c->base_server->timeout * APR_USEC_PER_SEC));
-        }
     }
 
     /* ### This is bad. */
@@ -3272,6 +3285,8 @@ static int core_create_req(request_rec *r)
         req_cfg->bb = apr_brigade_create(r->pool);
         ap_set_module_config(r->request_config, &core_module, req_cfg);
     }
+
+    ap_add_input_filter("NET_TIME", NULL, r, r->connection);
     return OK;
 }
 
@@ -3355,6 +3370,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_insert_filter(core_insert_filter, NULL, NULL, APR_HOOK_MIDDLE);
 
     ap_register_input_filter("CORE_IN", core_input_filter, AP_FTYPE_NETWORK);
+    ap_register_input_filter("NET_TIME", net_time_filter, AP_FTYPE_CONTENT);
     ap_register_output_filter("CONTENT_LENGTH", ap_content_length_filter, 
                               AP_FTYPE_HTTP_HEADER);
     ap_register_output_filter("CORE", core_output_filter, AP_FTYPE_NETWORK);

diff --git a/server/protocol.c b/server/protocol.c
index ab79ec1b0e17c9606be428b7af2bb95628ce269f..a779e1401cd511846427508ebafcacd7720d5371 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -553,8 +553,6 @@ request_rec *ap_read_request(conn_rec *conn)
     r->connection      = conn;
     r->server          = conn->base_server;
 
-    conn->keepalive    = 0;
-
     r->user            = NULL;
     r->ap_auth_type    = NULL;