Merge pull request #111 from moteus/master

Support libcurl 7.55.1

Author: moteus

appveyor.yml

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

src/lceasy.c

@@ -813,6 +813,23 @@ static int lcurl_info_get_double_(lua_State *L, int opt){
   return 1;
 }
 
+#if LCURL_CURL_VER_GE(7,55,0)
+
+static int lcurl_info_get_offset_(lua_State *L, int opt){
+  lcurl_easy_t *p = lcurl_geteasy(L);
+  curl_off_t val; CURLcode code;
+
+  code = curl_easy_getinfo(p->curl, opt, &val);
+  if(code != CURLE_OK){
+    return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_EASY, code);
+  }
+
+  lutil_pushint64(L, val);
+  return 1;
+}
+
+#endif
+
 static int lcurl_info_get_string_(lua_State *L, int opt){
   lcurl_easy_t *p = lcurl_geteasy(L);
   char *val; CURLcode code;
@@ -890,6 +907,10 @@ static int lcurl_info_get_certinfo_(lua_State *L, int opt){
   return lcurl_info_get_double_(L, CURLINFO_##N);\
 }
 
+#define LCURL_OFF_INFO(N, S) static int lcurl_easy_get_##N(lua_State *L){\
+  return lcurl_info_get_offset_(L, CURLINFO_##N);\
+}
+
 #define LCURL_CERTINFO_INFO(N, S) static int lcurl_easy_get_##N(lua_State *L){\
   return lcurl_info_get_certinfo_(L, CURLINFO_##N);\
 }

src/lcflags.h

@@ -18,6 +18,9 @@ FLG_ENTRY(AUTH_ONLY                       )
 #endif
 FLG_ENTRY(AUTH_ANY                        )
 FLG_ENTRY(AUTH_ANYSAFE                    )
+#if LCURL_CURL_VER_GE(7,55,0)
+FLG_ENTRY(AUTH_GSSAPI                     )
+#endif
 
 #ifdef CURLSSH_AUTH_ANY
 FLG_ENTRY(SSH_AUTH_ANY                    )

src/lcinfoeasy.h

@@ -54,6 +54,15 @@ OPT_ENTRY( protocol,                PROTOCOL,                LNG, 0)
 OPT_ENTRY( scheme,                  SCHEME,                  STR, 0)
 #endif
 
+#if LCURL_CURL_VER_GE(7,55,0)
+OPT_ENTRY( content_length_download_t, CONTENT_LENGTH_DOWNLOAD_T, OFF, 0)
+OPT_ENTRY( content_length_upload_t,   CONTENT_LENGTH_UPLOAD_T,   OFF, 0)
+OPT_ENTRY( size_download_t,           SIZE_DOWNLOAD_T,           OFF, 0)
+OPT_ENTRY( size_upload_t,             SIZE_UPLOAD_T,             OFF, 0)
+OPT_ENTRY( speed_download_t,          SPEED_DOWNLOAD_T,          OFF, 0)
+OPT_ENTRY( speed_upload_t,            SPEED_UPLOAD_T,            OFF, 0)
+#endif
+
 // OPT_ENTRY( PRIVATE,                 void     ) 
 // OPT_ENTRY( TLS_SSL_PTR,             struct curl_tlssessioninfo **
 // OPT_ENTRY( TLS_SESSION,             struct curl_tlssessioninfo *

src/lcopteasy.h

@@ -396,6 +396,11 @@ OPT_ENTRY( abstract_unix_socket,   ABSTRACT_UNIX_SOCKET,  STR, 0, LCURL_DEFAULT_
 OPT_ENTRY( suppress_connect_headers, SUPPRESS_CONNECT_HEADERS, LNG, 0, LCURL_DEFAULT_VALUE)
 #endif
 
+#if LCURL_CURL_VER_GE(7,55,0)
+OPT_ENTRY( request_target,           REQUEST_TARGET,           STR, 0, LCURL_DEFAULT_VALUE)
+OPT_ENTRY( socks5_auth,              SOCKS5_AUTH,              LNG, 0, LCURL_DEFAULT_VALUE)
+#endif
+
 #ifdef LCURL__TCP_FASTOPEN
 #  define TCP_FASTOPEN LCURL__TCP_FASTOPEN
 #  undef LCURL__TCP_FASTOPEN

src/lua/cURL/impl/cURL.lua

@@ -376,6 +376,7 @@ Easy.setopt_httpauth  = wrap_setopt_flags("httpauth", {
   ["NEGOTIATE"       ] = curl.AUTH_NEGOTIATE;
   ["NTLM"            ] = curl.AUTH_NTLM;
   ["DIGEST_IE"       ] = curl.AUTH_DIGEST_IE;
+  ["GSSAPI"          ] = curl.AUTH_GSSAPI;
   ["NTLM_WB"         ] = curl.AUTH_NTLM_WB;
   ["ONLY"            ] = curl.AUTH_ONLY;
   ["ANY"             ] = curl.AUTH_ANY;