atria-soft/enet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] add option header'

Browse Source
This commit is contained in:
Edouard DUPIN 2018-04-11 22:53:19 +02:00
parent 273982e7d3
commit 5e422227ab
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
enet/Http.cpp
View File

@ -248,6 +248,9 @@ namespace etk {
} else if (_value == "DELETE") { } else if (_value == "DELETE") {
_variableRet = enet::HTTPReqType::HTTP_DELETE; _variableRet = enet::HTTPReqType::HTTP_DELETE;
return true; return true;
} else if (_value == "OPTIONS") {
_variableRet = enet::HTTPReqType::HTTP_OPTIONS;
return true;
} }
return false; return false;
} }
@ -259,6 +262,7 @@ namespace etk {
case enet::HTTPReqType::HTTP_POST: return "POST"; case enet::HTTPReqType::HTTP_POST: return "POST";
case enet::HTTPReqType::HTTP_PUT: return "PUT"; case enet::HTTPReqType::HTTP_PUT: return "PUT";
case enet::HTTPReqType::HTTP_DELETE: return "DELETE"; case enet::HTTPReqType::HTTP_DELETE: return "DELETE";
case enet::HTTPReqType::HTTP_OPTIONS: return "OPTIONS";
} }
return "UNKNOW"; return "UNKNOW";
} }
@ -364,8 +368,14 @@ namespace etk {
void enet::Http::setRequestHeader(const enet::HttpRequest& _req) { void enet::Http::setRequestHeader(const enet::HttpRequest& _req) {
m_requestHeader = _req; m_requestHeader = _req;
if (m_requestHeader.getKey("User-Agent") == "") { if (m_isServer == true) {
m_requestHeader.setKey("User-Agent", "e-net (ewol network interface)"); if (m_requestHeader.getKey("Server") == "") {
m_requestHeader.setKey("Server", "e-net (ewol network interface)");
}
} else {
if (m_requestHeader.getKey("User-Agent") == "") {
m_requestHeader.setKey("User-Agent", "e-net (ewol network interface)");
}
} }
etk::String value = m_requestHeader.generate(); etk::String value = m_requestHeader.generate();
write(value, false); write(value, false);
@ -373,8 +383,14 @@ void enet::Http::setRequestHeader(const enet::HttpRequest& _req) {
void enet::Http::setAnswerHeader(const enet::HttpAnswer& _req) { void enet::Http::setAnswerHeader(const enet::HttpAnswer& _req) {
m_answerHeader = _req; m_answerHeader = _req;
if (m_requestHeader.getKey("User-Agent") == "") { if (m_isServer == true) {
m_requestHeader.setKey("User-Agent", "e-net (ewol network interface)"); if (m_requestHeader.getKey("Server") == "") {
m_requestHeader.setKey("Server", "e-net (ewol network interface)");
}
} else {
if (m_requestHeader.getKey("User-Agent") == "") {
m_requestHeader.setKey("User-Agent", "e-net (ewol network interface)");
}
} }
etk::String value = m_answerHeader.generate(); etk::String value = m_answerHeader.generate();
write(value, false); write(value, false);
@ -438,7 +454,8 @@ void enet::Http::getHeader() {
|| listLineOne[0] == "POST" || listLineOne[0] == "POST"
|| listLineOne[0] == "HEAD" || listLineOne[0] == "HEAD"
|| listLineOne[0] == "DELETE" || listLineOne[0] == "DELETE"
|| listLineOne[0] == "PUT" ) ) { || listLineOne[0] == "PUT"
|| listLineOne[0] == "OPTIONS" ) ) {
// HTTP CALL // HTTP CALL
if (m_isServer == false) { if (m_isServer == false) {
// can not have call in client mode // can not have call in client mode
@ -637,7 +654,7 @@ etk::String enet::HttpHeader::generateKeys() const {
for (auto &it : m_map) { for (auto &it : m_map) {
if ( it.first != "" if ( it.first != ""
&& it.second != "") { && it.second != "") {
out += escapeChar(it.first) + " : " + escapeChar(it.second) + "\r\n"; out += escapeChar(it.first) + ": " + escapeChar(it.second) + "\r\n";
} }
} }
return out; return out;

1
enet/Http.hpp
View File

@ -162,6 +162,7 @@ namespace enet {
HTTP_POST, HTTP_POST,
HTTP_PUT, HTTP_PUT,
HTTP_DELETE, HTTP_DELETE,
HTTP_OPTIONS,
}; };
etk::Stream& operator <<(etk::Stream& _os, enum enet::HTTPReqType _obj); etk::Stream& operator <<(etk::Stream& _os, enum enet::HTTPReqType _obj);
class HttpRequest : public HttpHeader { class HttpRequest : public HttpHeader {