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

h2load: Handle HTTP/1 non-final response

This commit is contained in:
Tatsuhiro Tsujikawa 2018-11-15 10:13:19 +09:00
parent f6644a92af
commit 172924457f
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/h2load_http1_session.cc
View File

@ -70,6 +70,11 @@ namespace {
int htp_statuscb(http_parser *htp, const char *at, size_t length) { int htp_statuscb(http_parser *htp, const char *at, size_t length) {
auto session = static_cast<Http1Session *>(htp->data); auto session = static_cast<Http1Session *>(htp->data);
auto client = session->get_client(); auto client = session->get_client();
if (htp->status_code / 100 == 1) {
return 0;
}
client->on_status_code(session->stream_resp_counter_, htp->status_code); client->on_status_code(session->stream_resp_counter_, htp->status_code);
return 0; return 0;
@ -82,6 +87,10 @@ int htp_msg_completecb(http_parser *htp) {
auto session = static_cast<Http1Session *>(htp->data); auto session = static_cast<Http1Session *>(htp->data);
auto client = session->get_client(); auto client = session->get_client();
if (htp->status_code / 100 == 1) {
return 0;
}
client->final = http_should_keep_alive(htp) == 0; client->final = http_should_keep_alive(htp) == 0;
auto req_stat = client->get_req_stat(session->stream_resp_counter_); auto req_stat = client->get_req_stat(session->stream_resp_counter_);
@ -133,6 +142,12 @@ int htp_hdr_valcb(http_parser *htp, const char *data, size_t len) {
} }
} // namespace } // namespace
namespace {
int htp_hdrs_completecb(http_parser *htp) {
return !http2::expect_response_body(htp->status_code);
}
} // namespace
namespace { namespace {
int htp_body_cb(http_parser *htp, const char *data, size_t len) { int htp_body_cb(http_parser *htp, const char *data, size_t len) {
auto session = static_cast<Http1Session *>(htp->data); auto session = static_cast<Http1Session *>(htp->data);
@ -147,14 +162,14 @@ int htp_body_cb(http_parser *htp, const char *data, size_t len) {
namespace { namespace {
constexpr http_parser_settings htp_hooks = { constexpr http_parser_settings htp_hooks = {
htp_msg_begincb, // http_cb on_message_begin; htp_msg_begincb, // http_cb on_message_begin;
nullptr, // http_data_cb on_url; nullptr, // http_data_cb on_url;
htp_statuscb, // http_data_cb on_status; htp_statuscb, // http_data_cb on_status;
htp_hdr_keycb, // http_data_cb on_header_field; htp_hdr_keycb, // http_data_cb on_header_field;
htp_hdr_valcb, // http_data_cb on_header_value; htp_hdr_valcb, // http_data_cb on_header_value;
nullptr, // http_cb on_headers_complete; htp_hdrs_completecb, // http_cb on_headers_complete;
htp_body_cb, // http_data_cb on_body; htp_body_cb, // http_data_cb on_body;
htp_msg_completecb // http_cb on_message_complete; htp_msg_completecb // http_cb on_message_complete;
}; };
} // namespace } // namespace