Merge branch 'master' into url_api

This commit is contained in:
Alexey Melnichuk 2018-11-04 14:19:17 +03:00
commit 0b2137c6a0

View File

@ -1774,7 +1774,9 @@ static const struct luaL_Reg lcurl_easy_methods[] = {
{ "escape", lcurl_easy_escape }, { "escape", lcurl_easy_escape },
{ "unescape", lcurl_easy_unescape }, { "unescape", lcurl_easy_unescape },
{ "perform", lcurl_easy_perform }, { "perform", lcurl_easy_perform },
#if LCURL_CURL_VER_GE(7,62,0)
{ "upkeep", lcurl_easy_upkeep }, { "upkeep", lcurl_easy_upkeep },
#endif
{ "close", lcurl_easy_cleanup }, { "close", lcurl_easy_cleanup },
{ "__gc", lcurl_easy_cleanup }, { "__gc", lcurl_easy_cleanup },
{ "__tostring", lcurl_easy_to_s }, { "__tostring", lcurl_easy_to_s },