hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1220: Move header generation back to HttpResponse

Browse Source 
The actual list of headers is not known when the request is first
generated. This prevents the headers from being generated in admin.cc
which handles things on a lower level.

The moving of the header generation is done with the OPTIONS method in
mind. This header needs to be generated inside the RootResource class
which manages the navigation of the resources.
This commit is contained in:
Markus Mäkelä
2017-04-19 20:58:23 +03:00
committed by Markus Mäkelä
parent bc3cfe0221
commit c17c451fb5
5 changed files with 82 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/core/httpresponse.cc
View File

@ -28,13 +28,18 @@ HttpResponse::HttpResponse(int code, json_t* response):
m_body(response),
m_code(code)
{
string http_date = http_get_date();
add_header(HTTP_RESPONSE_HEADER_DATE, http_date);
add_header(HTTP_RESPONSE_HEADER_LAST_MODIFIED, http_date);
// This ETag is the base64 encoding of `not-yet-implemented`
add_header(HTTP_RESPONSE_HEADER_ETAG, "bm90LXlldC1pbXBsZW1lbnRlZAo");
}
HttpResponse::HttpResponse(const HttpResponse& response):
m_body(response.m_body),
m_code(response.m_code)
m_body(json_incref(response.m_body)),
m_code(response.m_code),
m_headers(response.m_headers)
{
json_incref(m_body);
}
HttpResponse& HttpResponse::operator=(const HttpResponse& response)
@ -42,6 +47,7 @@ HttpResponse& HttpResponse::operator=(const HttpResponse& response)
json_t* body = m_body;
m_body = json_incref(response.m_body);
m_code = response.m_code;
m_headers = response.m_headers;
json_decref(body);
return *this;
}
@ -59,7 +65,23 @@ json_t* HttpResponse::get_response() const
return m_body;
}
void HttpResponse::drop_response()
{
json_decref(m_body);
m_body = NULL;
}
int HttpResponse::get_code() const
{
return m_code;
}
void HttpResponse::add_header(const string& key, const string& value)
{
m_headers[key] = value;
}
const Headers& HttpResponse::get_headers() const
{
return m_headers;
}