lib-http: http-server-connection - Significantly simplify destroying the request...

diff --git a/src/lib-http/http-server-connection.c b/src/lib-http/http-server-connection.c
index 641541292ae7bea69f9f58b3a856340c0d198bed..8be697cedf4c41c151c36c974e249dccb6cb9514 100644 (file)
--- a/src/lib-http/http-server-connection.c
+++ b/src/lib-http/http-server-connection.c
@@ -82,11 +82,23 @@ void http_server_connection_input_halt(struct http_server_connection *conn)
 void http_server_connection_input_resume(struct http_server_connection *conn)
 {
        if (conn->closed || conn->input_broken || conn->close_indicated ||
-           conn->in_req_callback || conn->incoming_payload != NULL) {
+           conn->incoming_payload != NULL) {
                /* Connection not usable */
                return;
        }
 
+       if (conn->in_req_callback) {
+               struct http_server_request *req = conn->request_queue_tail;
+
+               /* Currently running request callback for this connection. Only
+                  handle discarded request payload. */
+               if (req == NULL ||
+                   req->state != HTTP_SERVER_REQUEST_STATE_SUBMITTED_RESPONSE)
+                       return;
+               if (!http_server_connection_pending_payload(conn))
+                       return;
+       }
+
        connection_input_resume(&conn->conn);
 }
 
@@ -170,18 +182,6 @@ static void http_server_connection_destroy(struct connection *_conn)
        http_server_connection_unref(&conn);
 }
 
-static void http_server_payload_finished(struct http_server_connection *conn)
-{
-       timeout_remove(&conn->to_input);
-       http_server_connection_input_resume(conn);
-}
-
-static void
-http_server_payload_destroyed_timeout(struct http_server_connection *conn)
-{
-       http_server_connection_input(&conn->conn);
-}
-
 static void http_server_payload_destroyed(struct http_server_request *req)
 {
        struct http_server_connection *conn = req->conn;
@@ -255,15 +255,9 @@ static void http_server_payload_destroyed(struct http_server_request *req)
                i_unreached();
        }
 
-       /* Input stream may have pending input. make sure input handler
-          gets called (but don't do it directly, since we get get here
-          somewhere from the API user's code, which we can't really know what
-          state it is in). this call also triggers sending the next response if
-          necessary. */
-       if (!conn->input_broken && !conn->in_req_callback) {
-               conn->to_input =
-                       timeout_add_short(0, http_server_payload_destroyed_timeout, conn);
-       }
+       /* Input stream may have pending input. */
+       http_server_connection_input_resume(conn);
+       http_server_connection_input_set_pending(conn);
 }
 
 static bool
@@ -273,7 +267,6 @@ http_server_connection_handle_request(struct http_server_connection *conn,
        const struct http_server_settings *set = &conn->server->set;
        unsigned int old_refcount;
        struct istream *payload;
-       bool payload_destroyed = FALSE;
 
        i_assert(!conn->in_req_callback);
        i_assert(conn->incoming_payload == NULL);
@@ -332,11 +325,6 @@ http_server_connection_handle_request(struct http_server_connection *conn,
                payload = req->req.payload;
                req->req.payload = NULL;
                i_stream_unref(&payload);
-               if (conn->to_input != NULL) {
-                       /* Already finished reading the payload */
-                       http_server_payload_finished(conn);
-                       payload_destroyed = TRUE;
-               }
        }
 
        if (req->state < HTTP_SERVER_REQUEST_STATE_PROCESSING &&
@@ -348,12 +336,12 @@ http_server_connection_handle_request(struct http_server_connection *conn,
                        http_server_request_submit_response(req);
        }
 
-       i_assert(!payload_destroyed || req->callback_refcount > 0 ||
+       i_assert(conn->incoming_payload != NULL || req->callback_refcount > 0 ||
                 (req->response != NULL && req->response->submitted));
 
        if (conn->incoming_payload == NULL) {
-               if (conn->conn.io == NULL && conn->to_input == NULL)
-                       http_server_connection_input_resume(conn);
+               http_server_connection_input_resume(conn);
+               http_server_connection_input_set_pending(conn);
                return TRUE;
        }
 
@@ -547,7 +535,6 @@ static void http_server_connection_input(struct connection *_conn)
                return;
        }
 
-       i_assert(!conn->in_req_callback);
        i_assert(!conn->input_broken && conn->incoming_payload == NULL);
        i_assert(!conn->close_indicated);
 
@@ -562,19 +549,18 @@ static void http_server_connection_input(struct connection *_conn)
                }
        }
 
-       if (conn->to_input != NULL) {
-               /* We came here from a timeout added by
-                  http_server_payload_destroyed(). The IO couldn't be added
-                  back immediately in there, because the HTTP API user may
-                  still have had its own IO pointed to the same fd. It should
-                  be removed by now, so we can add it back. */
-               http_server_payload_finished(conn);
-       }
-
        /* Finish up pending request */
        if (!http_server_connection_finish_request(conn))
                return;
 
+       /* Stop handling input here when running ioloop from within request
+          callback; we cannot read the next request, since that could mean
+          recursing request callbacks. */
+       if (conn->in_req_callback) {
+               http_server_connection_input_halt(conn);
+               return;
+       }
+
        /* Create request object if none was created already */
        if (conn->request_queue_tail != NULL &&
            conn->request_queue_tail->state == HTTP_SERVER_REQUEST_STATE_NEW) {

diff --git a/src/lib-http/http-server-request.c b/src/lib-http/http-server-request.c
index 2d8dad079990bdd9adc60bf37b91a67a6b72232d..d83a630db2d936356ab6bee1f80b39c0e639548c 100644 (file)
--- a/src/lib-http/http-server-request.c
+++ b/src/lib-http/http-server-request.c
@@ -352,6 +352,8 @@ void http_server_request_submit_response(struct http_server_request *req)
                if (!http_server_request_is_complete(req)) {
                        e_debug(req->event, "Not ready to respond");
                        req->state = HTTP_SERVER_REQUEST_STATE_SUBMITTED_RESPONSE;
+                       http_server_connection_input_resume(req->conn);
+                       http_server_connection_input_set_pending(req->conn);
                        break;
                }
                http_server_request_ready_to_respond(req);