]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-http: server: Changed http_server_request_is_complete() from an inline to a norma...
authorStephan Bosch <stephan.bosch@dovecot.fi>
Mon, 27 Mar 2017 18:44:37 +0000 (20:44 +0200)
committerGitLab <gitlab@git.dovecot.net>
Tue, 4 Jul 2017 12:56:17 +0000 (15:56 +0300)
src/lib-http/http-server-private.h
src/lib-http/http-server-request.c

index 982cdd88b6b6cc3c1b0f7d394a74f5d76e6dc037..35db58fafe252d39c057f727abe72425fd2884e6 100644 (file)
@@ -155,13 +155,6 @@ struct http_server {
        bool shutting_down:1;    /* shutting down server */
 };
 
-/*
- * Forward declarations
- */
-
-bool http_server_connection_pending_payload(
-       struct http_server_connection *conn);
-
 /*
  * Response
  */
@@ -195,14 +188,6 @@ http_server_request_is_new(struct http_server_request *req)
        return (req->state == HTTP_SERVER_REQUEST_STATE_NEW);
 }
 
-static inline bool
-http_server_request_is_complete(struct http_server_request *req)
-{
-       return (req->failed || req->conn->input_broken ||
-               (req->next != NULL && !http_server_request_is_new(req->next)) ||
-               !http_server_connection_pending_payload(req->conn));
-}
-
 static inline bool
 http_server_request_version_equals(struct http_server_request *req,
        unsigned int major, unsigned int minor) {
@@ -215,6 +200,8 @@ void http_server_request_destroy(struct http_server_request **_req);
 void http_server_request_abort(struct http_server_request **_req,
        const char *reason) ATTR_NULL(2);
 
+bool http_server_request_is_complete(struct http_server_request *req);
+
 void http_server_request_halt_payload(struct http_server_request *req);
 void http_server_request_continue_payload(struct http_server_request *req);
 
index 96a24e9f048312aef7f6b046396e817816d82561..8c8196f53e0ced2d717a84ffd2a07c47ae5bda64 100644 (file)
@@ -210,6 +210,13 @@ bool http_server_request_is_finished(struct http_server_request *req)
                req->state == HTTP_SERVER_REQUEST_STATE_ABORTED;
 }
 
+bool http_server_request_is_complete(struct http_server_request *req)
+{
+       return (req->failed || req->conn->input_broken ||
+               (req->next != NULL && !http_server_request_is_new(req->next)) ||
+               !http_server_connection_pending_payload(req->conn));
+}
+
 void http_server_request_halt_payload(struct http_server_request *req)
 {
        i_assert(req->state <= HTTP_SERVER_REQUEST_STATE_QUEUED);