From caedf0ee9c4d7c753386f8040c100e5a50015549 Mon Sep 17 00:00:00 2001 From: zhengchao Date: Wed, 31 Oct 2018 12:08:47 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8Dcache=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=97=B6=EF=BC=8C=E6=9C=AA=E5=88=A4=E6=96=AD=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=8A=B6=E6=80=81=E7=9A=84bug=E3=80=822=E3=80=81upstr?= =?UTF-8?q?eam=20ssl=E6=97=A0alpn=E6=97=B6=EF=BC=8Cdownstream=20ssl=20?= =?UTF-8?q?=E4=B8=8D=E6=B3=A8=E5=86=8Calpn=E5=9B=9E=E8=B0=83=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/src/ssl_stream.cpp | 2 +- plugin/business/pangu-http/src/pangu_http.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/src/ssl_stream.cpp b/platform/src/ssl_stream.cpp index e5371fe..6f203f9 100644 --- a/platform/src/ssl_stream.cpp +++ b/platform/src/ssl_stream.cpp @@ -1383,7 +1383,7 @@ static SSL * downstream_ssl_create(struct ssl_mgr * mgr, struct keyring * crt, c SSL_CTX_set_tmp_ecdh(sslctx, ecdh); EC_KEY_free(ecdh); } - if(!mgr->no_alpn) + if(!mgr->no_alpn && selected_alpn) { SSL_CTX_set_alpn_select_cb(sslctx, alpn_select_proto_cb, (void*)selected_alpn); } diff --git a/plugin/business/pangu-http/src/pangu_http.cpp b/plugin/business/pangu-http/src/pangu_http.cpp index 1c0fd4d..41e91b2 100644 --- a/plugin/business/pangu-http/src/pangu_http.cpp +++ b/plugin/business/pangu-http/src/pangu_http.cpp @@ -1215,7 +1215,7 @@ void pangu_on_http_data(const struct tfe_stream * stream, const struct tfe_http_ } } - if(tfe_http_in_response(events)) + if(tfe_http_in_response(events)&& ctx->pending_result==PENDING_RESULT_MISS) { cache_update(session, events, body_frag, frag_size, thread_id, ctx); }