Merge pull request #73 from moteus/master

Add. Support curl 7.49.0
2016-05-25 15:52:47 +03:00 · 2016-05-25 15:52:47 +03:00 · 8aa9f702b7
commit 8aa9f702b7
parent cf41acae7b 3375578dcf
3 changed files with 12 additions and 1 deletions
--- a/appveyor.yml
+++ b/appveyor.yml
@ -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
--- a/src/lcerr_easy.h
+++ b/src/lcerr_easy.h
@ -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
--- a/src/lcopteasy.h
+++ b/src/lcopteasy.h
@ -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*/
@ -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