diff --git a/src/HttpRequest.cpp b/src/HttpRequest.cpp index 6ce8457..bca8494 100644 --- a/src/HttpRequest.cpp +++ b/src/HttpRequest.cpp @@ -14,13 +14,13 @@ const char * HttpRequest::getMethod() return method; } -const char * HttpRequest::setHttpVer(const char * ver) +const char * HttpRequest::setHttpVersion(const char * ver) { strncpy(this->httpver, ver, HTTPREQUEST_HTTPVER_SIZE); return this->httpver; } -const char * HttpRequest::getHttpVer() +const char * HttpRequest::getHttpVersion() const { return httpver; } diff --git a/src/HttpRequest.h b/src/HttpRequest.h index 6af38a0..f228766 100644 --- a/src/HttpRequest.h +++ b/src/HttpRequest.h @@ -24,8 +24,8 @@ class HttpRequest const char * setUrl(const char *); const char * setUrl(const char *, size_t); const char * getUrl(); - const char * setHttpVer(const char *); // TODO: setHttpVersion() - const char * getHttpVer(); // TODO: getHttpVersion() + const char * setHttpVersion(const char *); + const char * getHttpVersion() const; const char * setMessage(const char *); const char * setMessage(const char *, unsigned int); const char * getMessage(); diff --git a/src/RequestParser.cpp b/src/RequestParser.cpp index 71d8035..de1d761 100644 --- a/src/RequestParser.cpp +++ b/src/RequestParser.cpp @@ -41,7 +41,7 @@ bool RequestParser::parse() { if (in == '\r') continue; if (in == '\n') { *(_i) = '\0'; - request.setHttpVer(_buffer); + request.setHttpVersion(_buffer); _i = _buffer; _state = S_IN_HEADER; break; diff --git a/src/WebKernel.cpp b/src/WebKernel.cpp index bb2a9a3..0e22d6e 100644 --- a/src/WebKernel.cpp +++ b/src/WebKernel.cpp @@ -37,7 +37,7 @@ void WebKernel::handleClients() _client.flush(); case S_DISPATCHING: HttpResponse response(_resp_buffer); - response.setHttpVersion(_request.getHttpVer()); + response.setHttpVersion(_request.getHttpVersion()); _dispatcher.handle(_request, response); response.headers.set("Connection","close"); _client.print(response); diff --git a/test/test_RequestParser.cpp b/test/test_RequestParser.cpp index 20c5f17..2610121 100644 --- a/test/test_RequestParser.cpp +++ b/test/test_RequestParser.cpp @@ -20,7 +20,7 @@ TEST_CASE("Test GET","[RequestParser]") client.write("HTTP/1.1\r\n"); CHECK(parser.parse() == 0); - CHECK_THAT(request.getHttpVer(), Equals("HTTP/1.1")); + CHECK_THAT(request.getHttpVersion(), Equals("HTTP/1.1")); client.write("Host: localhost\r\n"); CHECK(parser.parse() == 0);