diff --git a/src/lcerr_easy.h b/src/lcerr_easy.h index 21da152..573dac0 100644 --- a/src/lcerr_easy.h +++ b/src/lcerr_easy.h @@ -108,3 +108,6 @@ ERR_ENTRY ( CHUNK_FAILED ) #if LCURL_CURL_VER_GE(7,30,0) ERR_ENTRY ( NO_CONNECTION_AVAILABLE ) #endif +#if LCURL_CURL_VER_GE(7,38,0) +ERR_ENTRY ( HTTP2 ) +#endif diff --git a/src/lcflags.h b/src/lcflags.h index c1efbc8..5dd7f79 100644 --- a/src/lcflags.h +++ b/src/lcflags.h @@ -3,6 +3,9 @@ FLG_ENTRY(AUTH_NONE ) FLG_ENTRY(AUTH_BASIC ) FLG_ENTRY(AUTH_DIGEST ) FLG_ENTRY(AUTH_GSSNEGOTIATE ) +#if LCURL_CURL_VER_GE(7,38,0) +FLG_ENTRY(AUTH_NEGOTIATE ) +#endif FLG_ENTRY(AUTH_NTLM ) #if LCURL_CURL_VER_GE(7,19,3) FLG_ENTRY(AUTH_DIGEST_IE ) diff --git a/src/lcurl.c b/src/lcurl.c index 0645e24..2ca2e12 100644 --- a/src/lcurl.c +++ b/src/lcurl.c @@ -90,6 +90,9 @@ static int lcurl_version_info(lua_State *L){ lua_pushliteral(L, "LIBZ"); lua_pushboolean(L, data->features & CURL_VERSION_LIBZ ); lua_rawset(L, -3); lua_pushliteral(L, "NTLM"); lua_pushboolean(L, data->features & CURL_VERSION_NTLM ); lua_rawset(L, -3); lua_pushliteral(L, "GSSNEGOTIATE"); lua_pushboolean(L, data->features & CURL_VERSION_GSSNEGOTIATE); lua_rawset(L, -3); +#if LCURL_CURL_VER_GE(7,38,0) + lua_pushliteral(L, "GSSAPI"); lua_pushboolean(L, data->features & CURL_VERSION_GSSAPI ); lua_rawset(L, -3); +#endif lua_pushliteral(L, "DEBUG"); lua_pushboolean(L, data->features & CURL_VERSION_DEBUG ); lua_rawset(L, -3); lua_pushliteral(L, "ASYNCHDNS"); lua_pushboolean(L, data->features & CURL_VERSION_ASYNCHDNS ); lua_rawset(L, -3); lua_pushliteral(L, "SPNEGO"); lua_pushboolean(L, data->features & CURL_VERSION_SPNEGO ); lua_rawset(L, -3); diff --git a/src/lua/cURL/impl/cURL.lua b/src/lua/cURL/impl/cURL.lua index ab10188..ec43355 100644 --- a/src/lua/cURL/impl/cURL.lua +++ b/src/lua/cURL/impl/cURL.lua @@ -248,6 +248,7 @@ Easy.setopt_httpauth = wrap_setopt_flags("httpauth", { ["BASIC" ] = curl.AUTH_BASIC; ["DIGEST" ] = curl.AUTH_DIGEST; ["GSSNEGOTIATE" ] = curl.AUTH_GSSNEGOTIATE; + ["NEGOTIATE" ] = curl.AUTH_NEGOTIATE; ["NTLM" ] = curl.AUTH_NTLM; ["DIGEST_IE" ] = curl.AUTH_DIGEST_IE; ["NTLM_WB" ] = curl.AUTH_NTLM_WB;