kenbarbour
/
HttpServer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed getHttpVer to getHttpVersion for consistency

feature/UrlUtils
Kenneth Barbour 2018-03-20 20:48:33 -04:00 committed by Kenneth Barbour
parent ab82e09798
commit ff3419a500
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/HttpRequest.cpp
View File

@ -14,13 +14,13 @@ const char * HttpRequest::getMethod()
return method; return method;
} }
const char * HttpRequest::setHttpVer(const char * ver) const char * HttpRequest::setHttpVersion(const char * ver)
{ {
strncpy(this->httpver, ver, HTTPREQUEST_HTTPVER_SIZE); strncpy(this->httpver, ver, HTTPREQUEST_HTTPVER_SIZE);
return this->httpver; return this->httpver;
} }
const char * HttpRequest::getHttpVer() const char * HttpRequest::getHttpVersion() const
{ {
return httpver; return httpver;
} }

4
src/HttpRequest.h
View File

@ -24,8 +24,8 @@ class HttpRequest
const char * setUrl(const char *); const char * setUrl(const char *);
const char * setUrl(const char *, size_t); const char * setUrl(const char *, size_t);
const char * getUrl(); const char * getUrl();
const char * setHttpVer(const char *); // TODO: setHttpVersion() const char * setHttpVersion(const char *);
const char * getHttpVer(); // TODO: getHttpVersion() const char * getHttpVersion() const;
const char * setMessage(const char *); const char * setMessage(const char *);
const char * setMessage(const char *, unsigned int); const char * setMessage(const char *, unsigned int);
const char * getMessage(); const char * getMessage();

2
src/RequestParser.cpp
View File

@ -41,7 +41,7 @@ bool RequestParser::parse() {
if (in == '\r') continue; if (in == '\r') continue;
if (in == '\n') { if (in == '\n') {
*(_i) = '\0'; *(_i) = '\0';
request.setHttpVer(_buffer); request.setHttpVersion(_buffer);
_i = _buffer; _i = _buffer;
_state = S_IN_HEADER; _state = S_IN_HEADER;
break; break;

2
src/WebKernel.cpp
View File

@ -37,7 +37,7 @@ void WebKernel::handleClients()
_client.flush(); _client.flush();
case S_DISPATCHING: case S_DISPATCHING:
HttpResponse response(_resp_buffer); HttpResponse response(_resp_buffer);
response.setHttpVersion(_request.getHttpVer()); response.setHttpVersion(_request.getHttpVersion());
_dispatcher.handle(_request, response); _dispatcher.handle(_request, response);
response.headers.set("Connection","close"); response.headers.set("Connection","close");
_client.print(response); _client.print(response);

2
test/test_RequestParser.cpp
View File

@ -20,7 +20,7 @@ TEST_CASE("Test GET","[RequestParser]")
client.write("HTTP/1.1\r\n"); client.write("HTTP/1.1\r\n");
CHECK(parser.parse() == 0); 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"); client.write("Host: localhost\r\n");
CHECK(parser.parse() == 0); CHECK(parser.parse() == 0);