Merge pull request #99 from moteus/master

Add. Support cURL 7.54.0
This commit is contained in:
Alexey Melnichuk 2017-05-23 16:43:39 +03:00 committed by GitHub
commit 9ac72c75a4
2 changed files with 17 additions and 1 deletions

View File

@ -7,7 +7,7 @@ shallow_clone: true
environment:
LR_EXTERNAL: c:\external
CURL_VER: 7.53.1
CURL_VER: 7.54.0
matrix:
- LUA: "lua 5.1"

View File

@ -267,6 +267,18 @@ FLG_ENTRY( SSLVERSION_TLSv1_0 )
FLG_ENTRY( SSLVERSION_TLSv1_1 )
FLG_ENTRY( SSLVERSION_TLSv1_2 )
#endif
#if LCURL_CURL_VER_GE(7,52,0)
FLG_ENTRY( SSLVERSION_TLSv1_3 )
#endif
#if LCURL_CURL_VER_GE(7,54,0)
FLG_ENTRY( SSLVERSION_MAX_NONE )
FLG_ENTRY( SSLVERSION_MAX_DEFAULT )
FLG_ENTRY( SSLVERSION_MAX_TLSv1_0 )
FLG_ENTRY( SSLVERSION_MAX_TLSv1_1 )
FLG_ENTRY( SSLVERSION_MAX_TLSv1_2 )
FLG_ENTRY( SSLVERSION_MAX_TLSv1_3 )
#endif
#if LCURL_CURL_VER_GE(7,21,4)
FLG_ENTRY( TLSAUTH_SRP )
@ -380,6 +392,10 @@ OPT_ENTRY( proxy_pinnedpublickey, PROXY_PINNEDPUBLICKEY, STR, 0, LCURL_DEFAULT
OPT_ENTRY( abstract_unix_socket, ABSTRACT_UNIX_SOCKET, STR, 0, LCURL_DEFAULT_VALUE)
#endif
#if LCURL_CURL_VER_GE(7,54,0)
OPT_ENTRY( suppress_connect_headers, SUPPRESS_CONNECT_HEADERS, LNG, 0, LCURL_DEFAULT_VALUE)
#endif
#ifdef LCURL__TCP_FASTOPEN
# define TCP_FASTOPEN LCURL__TCP_FASTOPEN
# undef LCURL__TCP_FASTOPEN