httpserver: use own HTTP status codes

toxeus · toxeus · commit aff2748f8aee · 2020-02-18T08:29:35.000+01:00
Before, macros defined in `&lt;event2/http.h&gt;` have been used
for some HTTP status codes.
`&lt;event2/http.h&gt;` is included implicitly and the usage
of its status code macros is inconsistent with the majority
HTTP response implementations in this file.

Now, the `HTTPStatusCode` enum from `&lt;rpc/protocol.h&gt;` is
consistently used for all HTTP response implementations.
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
@@ -236,7 +236,7 @@ static void http_request_cb(struct evhttp_request* req, void* arg)
     if (hreq->GetRequestMethod() == HTTPRequest::UNKNOWN) {
         LogPrint(BCLog::HTTP, "HTTP request from %s rejected: Unknown HTTP request method\n",
                  hreq->GetPeer().ToString());
-        hreq->WriteReply(HTTP_BADMETHOD);
+        hreq->WriteReply(HTTP_BAD_METHOD);
         return;
     }
 
@@ -268,10 +268,10 @@ static void http_request_cb(struct evhttp_request* req, void* arg)
             item.release(); /* if true, queue took ownership */
         else {
             LogPrintf("WARNING: request rejected because http work queue depth exceeded, it can be increased with the -rpcworkqueue= setting\n");
-            item->req->WriteReply(HTTP_INTERNAL, "Work queue depth exceeded");
+            item->req->WriteReply(HTTP_INTERNAL_SERVER_ERROR, "Work queue depth exceeded");
         }
     } else {
-        hreq->WriteReply(HTTP_NOTFOUND);
+        hreq->WriteReply(HTTP_NOT_FOUND);
     }
 }
 
@@ -519,7 +519,7 @@ HTTPRequest::~HTTPRequest()
     if (!replySent) {
         // Keep track of whether reply was sent to avoid request leaks
         LogPrintf("%s: Unhandled request\n", __func__);
-        WriteReply(HTTP_INTERNAL, "Unhandled request");
+        WriteReply(HTTP_INTERNAL_SERVER_ERROR, "Unhandled request");
     }
     // evhttpd cleans up the request, as long as a reply was sent.
 }

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ static void http_request_cb(struct evhttp_request* req, void* arg)`
`236`	`236`	`if (hreq->GetRequestMethod() == HTTPRequest::UNKNOWN) {`
`237`	`237`	`LogPrint(BCLog::HTTP, "HTTP request from %s rejected: Unknown HTTP request method\n",`
`238`	`238`	`hreq->GetPeer().ToString());`
`239`		`- hreq->WriteReply(HTTP_BADMETHOD);`
	`239`	`+ hreq->WriteReply(HTTP_BAD_METHOD);`
`240`	`240`	`return;`
`241`	`241`	`}`
`242`	`242`
`@@ -268,10 +268,10 @@ static void http_request_cb(struct evhttp_request* req, void* arg)`
`268`	`268`	`item.release(); /* if true, queue took ownership */`
`269`	`269`	`else {`
`270`	`270`	`LogPrintf("WARNING: request rejected because http work queue depth exceeded, it can be increased with the -rpcworkqueue= setting\n");`
`271`		`- item->req->WriteReply(HTTP_INTERNAL, "Work queue depth exceeded");`
	`271`	`+ item->req->WriteReply(HTTP_INTERNAL_SERVER_ERROR, "Work queue depth exceeded");`
`272`	`272`	`}`
`273`	`273`	`} else {`
`274`		`- hreq->WriteReply(HTTP_NOTFOUND);`
	`274`	`+ hreq->WriteReply(HTTP_NOT_FOUND);`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`
`@@ -519,7 +519,7 @@ HTTPRequest::~HTTPRequest()`
`519`	`519`	`if (!replySent) {`
`520`	`520`	`// Keep track of whether reply was sent to avoid request leaks`
`521`	`521`	`LogPrintf("%s: Unhandled request\n", __func__);`
`522`		`- WriteReply(HTTP_INTERNAL, "Unhandled request");`
	`522`	`+ WriteReply(HTTP_INTERNAL_SERVER_ERROR, "Unhandled request");`
`523`	`523`	`}`
`524`	`524`	`// evhttpd cleans up the request, as long as a reply was sent.`
`525`	`525`	`}`