Skip to content

Commit 76e102b

Browse files
committed
Merge pull request #20 from moteus/master
Add. libcurl 7.38.0 constants
2 parents 6755621 + 4a7901f commit 76e102b

4 files changed

Lines changed: 10 additions & 0 deletions

File tree

src/lcerr_easy.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,6 @@ ERR_ENTRY ( CHUNK_FAILED )
108108
#if LCURL_CURL_VER_GE(7,30,0)
109109
ERR_ENTRY ( NO_CONNECTION_AVAILABLE )
110110
#endif
111+
#if LCURL_CURL_VER_GE(7,38,0)
112+
ERR_ENTRY ( HTTP2 )
113+
#endif

src/lcflags.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ FLG_ENTRY(AUTH_NONE )
33
FLG_ENTRY(AUTH_BASIC )
44
FLG_ENTRY(AUTH_DIGEST )
55
FLG_ENTRY(AUTH_GSSNEGOTIATE )
6+
#if LCURL_CURL_VER_GE(7,38,0)
7+
FLG_ENTRY(AUTH_NEGOTIATE )
8+
#endif
69
FLG_ENTRY(AUTH_NTLM )
710
#if LCURL_CURL_VER_GE(7,19,3)
811
FLG_ENTRY(AUTH_DIGEST_IE )

src/lcurl.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ static int lcurl_version_info(lua_State *L){
9090
lua_pushliteral(L, "LIBZ"); lua_pushboolean(L, data->features & CURL_VERSION_LIBZ ); lua_rawset(L, -3);
9191
lua_pushliteral(L, "NTLM"); lua_pushboolean(L, data->features & CURL_VERSION_NTLM ); lua_rawset(L, -3);
9292
lua_pushliteral(L, "GSSNEGOTIATE"); lua_pushboolean(L, data->features & CURL_VERSION_GSSNEGOTIATE); lua_rawset(L, -3);
93+
#if LCURL_CURL_VER_GE(7,38,0)
94+
lua_pushliteral(L, "GSSAPI"); lua_pushboolean(L, data->features & CURL_VERSION_GSSAPI ); lua_rawset(L, -3);
95+
#endif
9396
lua_pushliteral(L, "DEBUG"); lua_pushboolean(L, data->features & CURL_VERSION_DEBUG ); lua_rawset(L, -3);
9497
lua_pushliteral(L, "ASYNCHDNS"); lua_pushboolean(L, data->features & CURL_VERSION_ASYNCHDNS ); lua_rawset(L, -3);
9598
lua_pushliteral(L, "SPNEGO"); lua_pushboolean(L, data->features & CURL_VERSION_SPNEGO ); lua_rawset(L, -3);

src/lua/cURL/impl/cURL.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ Easy.setopt_httpauth = wrap_setopt_flags("httpauth", {
248248
["BASIC" ] = curl.AUTH_BASIC;
249249
["DIGEST" ] = curl.AUTH_DIGEST;
250250
["GSSNEGOTIATE" ] = curl.AUTH_GSSNEGOTIATE;
251+
["NEGOTIATE" ] = curl.AUTH_NEGOTIATE;
251252
["NTLM" ] = curl.AUTH_NTLM;
252253
["DIGEST_IE" ] = curl.AUTH_DIGEST_IE;
253254
["NTLM_WB" ] = curl.AUTH_NTLM_WB;

0 commit comments

Comments
 (0)