gfwleak/tango-tfe
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复HTTP2提前删除应答信息，导致monitor下日志无记录

Browse Source
This commit is contained in:
fengweihao
2019-09-20 17:19:33 +08:00
parent 66b8924067
commit da8784bf5b
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/protocol/http2/src/http2_stream.cpp
View File

@@ -760,7 +760,6 @@ nghttp2_frame_submit_built_resp(struct tfe_h2_stream *h2_stream_info,
if (rv != 0){ if (rv != 0){
return ACTION_FORWARD_DATA; return ACTION_FORWARD_DATA;
} }
delete_nv_packet_data(h2_header);
return ACTION_DROP_DATA; return ACTION_DROP_DATA;
} }
@@ -805,7 +804,6 @@ nghttp2_frame_submit_built_req(struct tfe_h2_stream *h2_stream_info,
nghttp2_strerror(stream_id)); nghttp2_strerror(stream_id));
return ACTION_FORWARD_DATA; return ACTION_FORWARD_DATA;
} }
delete_nv_packet_data(h2_header);
return ACTION_DROP_DATA; return ACTION_DROP_DATA;
} }
@@ -1195,7 +1193,6 @@ nghttp2_submit_header_by_not_modify(struct tfe_h2_stream *h2_stream_info,
printf("Fatal headers error: %s\n", nghttp2_strerror(stream_id)); printf("Fatal headers error: %s\n", nghttp2_strerror(stream_id));
stream_action = ACTION_FORWARD_DATA; stream_action = ACTION_FORWARD_DATA;
} }
delete_nv_packet_data(&headers);
if (stream_action == ACTION_DROP_DATA){ if (stream_action == ACTION_DROP_DATA){
xret = nghttp2_session_send(h2_stream_info->as_server); xret = nghttp2_session_send(h2_stream_info->as_server);
@@ -1385,7 +1382,6 @@ nghttp2_server_frame_submit_push_promise(struct tfe_h2_stream *h2_stream_info,
} }
upstream_create_req(h2_stream_info, h2_stream_info->as_server, peer_h2_stream, stream_id); upstream_create_req(h2_stream_info, h2_stream_info->as_server, peer_h2_stream, stream_id);
/*clean header message **/ /*clean header message **/
delete_nv_packet_data(headers);
stream_action = ACTION_DROP_DATA; stream_action = ACTION_DROP_DATA;
finish: finish:
return stream_action; return stream_action;
@@ -1482,9 +1478,7 @@ fill_resp_spec_from_handle(struct tfe_h2_half_private *half_private)
return; return;
} }
int int nghttp2_write_log(struct tfe_h2_session *h2_session, const char * str_stream_info, int dir)
nghttp2_write_log(struct tfe_h2_session *h2_session, const char * str_stream_info,
int dir)
{ {
/* Request */ /* Request */
struct tfe_h2_half_private *req = h2_session->req; struct tfe_h2_half_private *req = h2_session->req;
@@ -1596,7 +1590,6 @@ nghttp2_server_frame_submit_header(struct tfe_h2_stream *h2_stream_info,
if (xret < 0){ if (xret < 0){
printf("Fatal headers error: %s\n", nghttp2_strerror(xret)); printf("Fatal headers error: %s\n", nghttp2_strerror(xret));
} }
delete_nv_packet_data(headers);
return stream_action; return stream_action;
} }
@@ -1780,7 +1773,6 @@ nghttp2_client_frame_submit_header(struct tfe_h2_stream *h2_stream_info,
} }
stream_action = ACTION_DROP_DATA; stream_action = ACTION_DROP_DATA;
finish: finish:
delete_nv_packet_data(headers);
return stream_action; return stream_action;
} }