walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpd: Use stack allocated array for headers in submit_file_response

This commit is contained in:
Tatsuhiro Tsujikawa 2014-12-24 00:56:25 +09:00
parent a20ad03f7b
commit ac11ba32ee
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/HttpServer.cc
View File

@ -541,19 +541,21 @@ int Http2Handler::submit_file_response(const std::string &status,
auto date_str = cached_date; auto date_str = cached_date;
std::string content_length = util::utos(file_length); std::string content_length = util::utos(file_length);
std::string last_modified_str; std::string last_modified_str;
auto nva = std::vector<nghttp2_nv>{ nghttp2_nv nva[] = {
http2::make_nv_ls(":status", status), http2::make_nv_ls(":status", status),
http2::make_nv_ls("server", NGHTTPD_SERVER), http2::make_nv_ls("server", NGHTTPD_SERVER),
http2::make_nv_ls("content-length", content_length), http2::make_nv_ls("content-length", content_length),
http2::make_nv_ll("cache-control", "max-age=3600"), http2::make_nv_ll("cache-control", "max-age=3600"),
http2::make_nv_ls("date", *date_str), http2::make_nv_ls("date", *date_str),
http2::make_nv_ll("", ""),
}; };
size_t nvlen = 5;
if (last_modified != 0) { if (last_modified != 0) {
last_modified_str = util::http_date(last_modified); last_modified_str = util::http_date(last_modified);
nva.push_back(http2::make_nv_ls("last-modified", last_modified_str)); nva[nvlen++] = http2::make_nv_ls("last-modified", last_modified_str);
} }
return nghttp2_submit_response(session_, stream->stream_id, nva.data(), return nghttp2_submit_response(session_, stream->stream_id, nva, nvlen,
nva.size(), data_prd); data_prd);
} }
int Http2Handler::submit_response(const std::string &status, int32_t stream_id, int Http2Handler::submit_response(const std::string &status, int32_t stream_id,