Skip to content

Add. Support curl 7.49.0 #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 25, 2016
Merged

Add. Support curl 7.49.0 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ shallow_clone: true

environment:
LUAROCKS_VER: 2.2.1
CURL_VER: 7.48.0
CURL_VER: 7.49.0

matrix:
- LUA_VER: 5.1.5
Expand Down
3 changes: 3 additions & 0 deletions src/lcerr_easy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,6 @@ ERR_ENTRY ( SSL_PINNEDPUBKEYNOTMATCH )
#if LCURL_CURL_VER_GE(7,41,0)
ERR_ENTRY ( SSL_INVALIDCERTSTATUS )
#endif
#if LCURL_CURL_VER_GE(7,49,0)
ERR_ENTRY ( HTTP2_STREAM )
#endif
8 changes: 8 additions & 0 deletions src/lcopteasy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,9 @@ FLG_ENTRY( HTTP_VERSION_2 )
#if LCURL_CURL_VER_GE(7,47,0)
FLG_ENTRY( HTTP_VERSION_2TLS )
#endif
#if LCURL_CURL_VER_GE(7,49,0)
FLG_ENTRY( HTTP_VERSION_2_PRIOR_KNOWLEDGE )
#endif

FLG_ENTRY( READFUNC_PAUSE ) /*7.18.0*/
FLG_ENTRY( WRITEFUNC_PAUSE ) /*7.18.0*/
Expand Down Expand Up @@ -312,6 +315,11 @@ OPT_ENTRY( stream_weight, STREAM_WEIGHT, LNG, 0, LCUR
OPT_ENTRY( tftp_no_options, TFTP_NO_OPTIONS, LNG, 0, LCURL_DEFAULT_VALUE )
#endif

#if LCURL_CURL_VER_GE(7,49,0)
OPT_ENTRY( tcp_fastopen, TCP_FASTOPEN, LNG, 0, LCURL_DEFAULT_VALUE )
OPT_ENTRY( connect_to, CONNECT_TO, LST, 0, LCURL_DEFAULT_VALUE )
#endif

#ifdef OPT_ENTRY_IS_NULL
# undef OPT_ENTRY
#endif
Expand Down