From f56448be602b70e2dd8542c8b26ae218ef809a5d Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Wed, 9 Nov 2022 18:00:00 +0900 Subject: [PATCH] Deal with llhttp incompatible changes --- src/h2load_http1_session.cc | 17 +++++++++++++++-- src/nghttp.cc | 17 +++++++++++++++-- src/shrpx_http2_session.cc | 17 +++++++++++++++-- src/shrpx_http_downstream_connection.cc | 17 +++++++++++++++-- src/shrpx_https_upstream.cc | 13 +++++++++++++ 5 files changed, 73 insertions(+), 8 deletions(-) diff --git a/src/h2load_http1_session.cc b/src/h2load_http1_session.cc index 14e4d580..6bdcd047 100644 --- a/src/h2load_http1_session.cc +++ b/src/h2load_http1_session.cc @@ -150,13 +150,26 @@ constexpr llhttp_settings_t htp_hooks = { htp_msg_begincb, // llhttp_cb on_message_begin; nullptr, // llhttp_data_cb on_url; htp_statuscb, // llhttp_data_cb on_status; + nullptr, // llhttp_data_cb on_method; + nullptr, // llhttp_data_cb on_version; htp_hdr_keycb, // llhttp_data_cb on_header_field; htp_hdr_valcb, // llhttp_data_cb on_header_value; + nullptr, // llhttp_data_cb on_chunk_extension_name; + nullptr, // llhttp_data_cb on_chunk_extension_value; htp_hdrs_completecb, // llhttp_cb on_headers_complete; htp_body_cb, // llhttp_data_cb on_body; htp_msg_completecb, // llhttp_cb on_message_complete; - nullptr, // llhttp_cb on_chunk_header - nullptr, // llhttp_cb on_chunk_complete + nullptr, // llhttp_cb on_url_complete; + nullptr, // llhttp_cb on_status_complete; + nullptr, // llhttp_cb on_method_complete; + nullptr, // llhttp_cb on_version_complete; + nullptr, // llhttp_cb on_header_field_complete; + nullptr, // llhttp_cb on_header_value_complete; + nullptr, // llhttp_cb on_chunk_extension_name_complete; + nullptr, // llhttp_cb on_chunk_extension_value_complete; + nullptr, // llhttp_cb on_chunk_header; + nullptr, // llhttp_cb on_chunk_complete; + nullptr, // llhttp_cb on_reset; }; } // namespace diff --git a/src/nghttp.cc b/src/nghttp.cc index e6e0f885..61f82123 100644 --- a/src/nghttp.cc +++ b/src/nghttp.cc @@ -426,13 +426,26 @@ constexpr llhttp_settings_t htp_hooks = { htp_msg_begincb, // llhttp_cb on_message_begin; nullptr, // llhttp_data_cb on_url; nullptr, // llhttp_data_cb on_status; + nullptr, // llhttp_data_cb on_method; + nullptr, // llhttp_data_cb on_version; nullptr, // llhttp_data_cb on_header_field; nullptr, // llhttp_data_cb on_header_value; + nullptr, // llhttp_data_cb on_chunk_extension_name; + nullptr, // llhttp_data_cb on_chunk_extension_value; nullptr, // llhttp_cb on_headers_complete; nullptr, // llhttp_data_cb on_body; htp_msg_completecb, // llhttp_cb on_message_complete; - nullptr, // llhttp_cb on_chunk_header - nullptr, // llhttp_cb on_chunk_complete + nullptr, // llhttp_cb on_url_complete; + nullptr, // llhttp_cb on_status_complete; + nullptr, // llhttp_cb on_method_complete; + nullptr, // llhttp_cb on_version_complete; + nullptr, // llhttp_cb on_header_field_complete; + nullptr, // llhttp_cb on_header_value_complete; + nullptr, // llhttp_cb on_chunk_extension_name_complete; + nullptr, // llhttp_cb on_chunk_extension_value_complete; + nullptr, // llhttp_cb on_chunk_header; + nullptr, // llhttp_cb on_chunk_complete; + nullptr, // llhttp_cb on_reset; }; } // namespace diff --git a/src/shrpx_http2_session.cc b/src/shrpx_http2_session.cc index a83519ac..f0e9bf0e 100644 --- a/src/shrpx_http2_session.cc +++ b/src/shrpx_http2_session.cc @@ -345,13 +345,26 @@ constexpr llhttp_settings_t htp_hooks = { nullptr, // llhttp_cb on_message_begin; nullptr, // llhttp_data_cb on_url; nullptr, // llhttp_data_cb on_status; + nullptr, // llhttp_data_cb on_method; + nullptr, // llhttp_data_cb on_version; nullptr, // llhttp_data_cb on_header_field; nullptr, // llhttp_data_cb on_header_value; + nullptr, // llhttp_data_cb on_chunk_extension_name; + nullptr, // llhttp_data_cb on_chunk_extension_value; htp_hdrs_completecb, // llhttp_cb on_headers_complete; nullptr, // llhttp_data_cb on_body; nullptr, // llhttp_cb on_message_complete; - nullptr, // llhttp_cb on_chunk_header - nullptr, // llhttp_cb on_chunk_complete + nullptr, // llhttp_cb on_url_complete; + nullptr, // llhttp_cb on_status_complete; + nullptr, // llhttp_cb on_method_complete; + nullptr, // llhttp_cb on_version_complete; + nullptr, // llhttp_cb on_header_field_complete; + nullptr, // llhttp_cb on_header_value_complete; + nullptr, // llhttp_cb on_chunk_extension_name_complete; + nullptr, // llhttp_cb on_chunk_extension_value_complete; + nullptr, // llhttp_cb on_chunk_header; + nullptr, // llhttp_cb on_chunk_complete; + nullptr, // llhttp_cb on_reset; }; } // namespace diff --git a/src/shrpx_http_downstream_connection.cc b/src/shrpx_http_downstream_connection.cc index e44c21da..96ce4b29 100644 --- a/src/shrpx_http_downstream_connection.cc +++ b/src/shrpx_http_downstream_connection.cc @@ -266,13 +266,26 @@ constexpr llhttp_settings_t htp_hooks = { htp_msg_begincb, // llhttp_cb on_message_begin; nullptr, // llhttp_data_cb on_url; nullptr, // llhttp_data_cb on_status; + nullptr, // llhttp_data_cb on_method; + nullptr, // llhttp_data_cb on_version; htp_hdr_keycb, // llhttp_data_cb on_header_field; htp_hdr_valcb, // llhttp_data_cb on_header_value; + nullptr, // llhttp_data_cb on_chunk_extension_name; + nullptr, // llhttp_data_cb on_chunk_extension_value; htp_hdrs_completecb, // llhttp_cb on_headers_complete; htp_bodycb, // llhttp_data_cb on_body; htp_msg_completecb, // llhttp_cb on_message_complete; - nullptr, // llhttp_cb on_chunk_header - nullptr, // llhttp_cb on_chunk_complete + nullptr, // llhttp_cb on_url_complete; + nullptr, // llhttp_cb on_status_complete; + nullptr, // llhttp_cb on_method_complete; + nullptr, // llhttp_cb on_version_complete; + nullptr, // llhttp_cb on_header_field_complete; + nullptr, // llhttp_cb on_header_value_complete; + nullptr, // llhttp_cb on_chunk_extension_name_complete; + nullptr, // llhttp_cb on_chunk_extension_value_complete; + nullptr, // llhttp_cb on_chunk_header; + nullptr, // llhttp_cb on_chunk_complete; + nullptr, // llhttp_cb on_reset; }; } // namespace diff --git a/src/shrpx_https_upstream.cc b/src/shrpx_https_upstream.cc index c19ce1de..458b5426 100644 --- a/src/shrpx_https_upstream.cc +++ b/src/shrpx_https_upstream.cc @@ -66,13 +66,26 @@ constexpr llhttp_settings_t htp_hooks = { htp_msg_begin, // llhttp_cb on_message_begin; htp_uricb, // llhttp_data_cb on_url; nullptr, // llhttp_data_cb on_status; + nullptr, // llhttp_data_cb on_method; + nullptr, // llhttp_data_cb on_version; htp_hdr_keycb, // llhttp_data_cb on_header_field; htp_hdr_valcb, // llhttp_data_cb on_header_value; + nullptr, // llhttp_data_cb on_chunk_extension_name; + nullptr, // llhttp_data_cb on_chunk_extension_value; htp_hdrs_completecb, // llhttp_cb on_headers_complete; htp_bodycb, // llhttp_data_cb on_body; htp_msg_completecb, // llhttp_cb on_message_complete; + nullptr, // llhttp_cb on_url_complete; + nullptr, // llhttp_cb on_status_complete; + nullptr, // llhttp_cb on_method_complete; + nullptr, // llhttp_cb on_version_complete; + nullptr, // llhttp_cb on_header_field_complete; + nullptr, // llhttp_cb on_header_value_complete; + nullptr, // llhttp_cb on_chunk_extension_name_complete; + nullptr, // llhttp_cb on_chunk_extension_value_complete; nullptr, // llhttp_cb on_chunk_header; nullptr, // llhttp_cb on_chunk_complete; + nullptr, // llhttp_cb on_reset; }; } // namespace