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

修复redirect命中RespBody后,修改action状态，不发送日志

Browse Source 
修复pcre2_substitute失败后，页面无法显示
This commit is contained in:
fengweihao
2019-06-26 20:53:45 +08:00
parent c7ecf01427
commit 65e0ac29d5
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugin/business/pangu-http/src/pangu_http.cpp
View File

@@ -1516,6 +1516,7 @@ static void http_redirect(const struct tfe_http_session * session, enum tfe_http
if ((events & EV_HTTP_RESP_BODY_BEGIN) || (events & EV_HTTP_RESP_BODY_CONT)
|| (events & EV_HTTP_RESP_BODY_END) || (events & EV_HTTP_RESP_END))
{
ctx->action = PG_ACTION_NONE;
return;
}

2
plugin/business/pangu-http/src/pattern_replace.cpp
View File

@@ -227,7 +227,7 @@ not_enough_mem_retry:
if(rc<=0)
{
free(out_buffer);
outlen=rc;
outlen=0;
}
else
{

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

@@ -1261,8 +1261,9 @@ nghttp2_submit_frame_data(struct tfe_h2_stream *h2_stream_info,const nghttp2_fra
nghttp2_session *ngh2_session = tfe_h2_stream_get_nghttp2_peer_session(h2_stream_info, dir);
h2_session = (struct tfe_h2_session *)nghttp2_session_get_stream_user_data(ngh2_session, frame->hd.stream_id);
if (!h2_session)
if (h2_session == NULL)
{
nghttp2_submit_end_data_by_h2_half(h2_stream_info, frame->hd.stream_id, dir);
h2_stream_info->stream_action = ACTION_DROP_DATA;
return 0;
}
@@ -1615,6 +1616,8 @@ nghttp2_server_submit_header(struct tfe_h2_stream *h2_stream_info, int32_t strea
stream_id, h2_stream_info);
goto finish;
}
assert(h2_session->ngh2_stream_id == stream_id);
resp = h2_session->resp;
fill_resp_spec_from_handle(h2_session->resp);
@@ -1799,6 +1802,8 @@ nghttp2_client_submit_header(struct tfe_h2_stream *h2_stream_info, int32_t strea
stream_action = ACTION_FORWARD_DATA;
goto finish;
}
assert(h2_session->ngh2_stream_id == stream_id);
req = h2_session->req;
fill_req_spec_from_handle(h2_session->req);