renamed getHttpVer to getHttpVersion for consistency
parent
ab82e09798
commit
ff3419a500
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue