HTTPRequest::getMethod() now returns the actual method used by the client.

fhessel · fhessel · commit 9eab9728b7ad · 2019-02-16T18:26:25.000+01:00
This is relevant for the default handler, as it is not able to differentiate between methods otherwise.
diff --git a/src/HTTPConnection.cpp b/src/HTTPConnection.cpp
@@ -446,7 +446,14 @@ void HTTPConnection::loop() {
 					}
 
 					// Create request context
-					HTTPRequest req  = HTTPRequest(this, _httpHeaders, resolvedResource.getMatchingNode(), resolvedResource.getParams(), _httpResource);
+					HTTPRequest req  = HTTPRequest(
+						this,
+						_httpHeaders,
+						resolvedResource.getMatchingNode(),
+						_httpMethod,
+						resolvedResource.getParams(),
+						_httpResource
+					);
 					HTTPResponse res = HTTPResponse(this);
 
 					// Add default headers to the response
diff --git a/src/HTTPRequest.cpp b/src/HTTPRequest.cpp
@@ -6,11 +6,13 @@ HTTPRequest::HTTPRequest(
 		ConnectionContext * con,
 		HTTPHeaders * headers,
 		HTTPNode * resolvedNode,
+		std::string method,
 		ResourceParameters * params,
 		std::string requestString):
 	_con(con),
 	_headers(headers),
 	_resolvedNode(resolvedNode),
+	_method(method),
 	_params(params),
 	_requestString(requestString) {
 
@@ -83,7 +85,7 @@ std::string HTTPRequest::getRequestString() {
 }
 
 std::string HTTPRequest::getMethod() {
-	return _resolvedNode->getMethod();
+	return _method;
 }
 
 std::string HTTPRequest::getTag() {
diff --git a/src/HTTPRequest.hpp b/src/HTTPRequest.hpp
@@ -17,7 +17,7 @@ namespace httpsserver {
 
 class HTTPRequest {
 public:
-	HTTPRequest(ConnectionContext * con, HTTPHeaders * headers, HTTPNode * resolvedNode, ResourceParameters * params, std::string requestString);
+	HTTPRequest(ConnectionContext * con, HTTPHeaders * headers, HTTPNode * resolvedNode, std::string method, ResourceParameters * params, std::string requestString);
 	virtual ~HTTPRequest();
 
 	std::string getHeader(std::string name);
@@ -47,6 +47,8 @@ class HTTPRequest {
 
 	HTTPNode * _resolvedNode;
 
+	std::string _method;
+
 	ResourceParameters * _params;
 
 	std::string _requestString;
