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

Merge branch 'feature-pangu-http-test' of git.mesalab.cn:tango/tfe into feature-pangu-http-test

Browse Source 
# Conflicts:
#	plugin/business/pangu-http/pangu_http.cpp
This commit is contained in:
zhengchao
2018-09-19 14:27:37 +08:00
parent 61bc2eaac9 3d8498b648
commit 6733ff0686
12 changed files with 303 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/src/ssl_stream.cpp
View File

@@ -1032,7 +1032,8 @@ static SSL * downstream_ssl_create(struct ssl_mgr * mgr, struct keyring * crt)
SSL_CTX_set_session_cache_mode(sslctx, SSL_SESS_CACHE_SERVER | SSL_SESS_CACHE_NO_INTERNAL);
SSL_CTX_set_session_id_context(sslctx, (const unsigned char *) mgr->ssl_session_context,
sizeof(mgr->ssl_session_context));
ret = SSL_CTX_set_ex_data(sslctx, SSL_EX_DATA_IDX_SSLMGR, mgr);
assert(ret == 1);
if (mgr->dh)
{
SSL_CTX_set_tmp_dh(sslctx, mgr->dh);