Lua-cURL/Lua-cURLv3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add. Fifth version info fields.

Browse Source
This commit is contained in:
Alexey Melnichuk 2018-05-01 13:47:07 +03:00
parent ddf322e692
commit 27946bc985
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
msvc/lcurl.vcproj
View File

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="$(CPPLIB_DIR)\curl\7.56.0\include;$(LUA_DIR)\include" AdditionalIncludeDirectories="$(CPPLIB_DIR)\curl\7.59.0\include;$(LUA_DIR)\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LCURL_EXPORTS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LCURL_EXPORTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -63,7 +63,7 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="lua5.1.lib libcurl.lib ws2_32.lib" AdditionalDependencies="lua5.1.lib libcurl.lib ws2_32.lib"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(CPPLIB_DIR)\curl\7.56.0\lib&quot;;&quot;$(LUA_DIR)\lib&quot;" AdditionalLibraryDirectories="&quot;$(CPPLIB_DIR)\curl\7.59.0\lib&quot;;&quot;$(LUA_DIR)\lib&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
TargetMachine="1" TargetMachine="1"

14
src/lcurl.c
View File

@ -117,6 +117,9 @@ static int lcurl_version_info(lua_State *L){
#ifdef CURL_VERSION_MULTI_SSL #ifdef CURL_VERSION_MULTI_SSL
lua_pushliteral(L, "MULTI_SSL"); lua_pushboolean(L, data->features & CURL_VERSION_MULTI_SSL ); lua_rawset(L, -3); lua_pushliteral(L, "MULTI_SSL"); lua_pushboolean(L, data->features & CURL_VERSION_MULTI_SSL ); lua_rawset(L, -3);
#endif #endif
#ifdef CURL_VERSION_BROTLI
lua_pushliteral(L, "BROTLI"); lua_pushboolean(L, data->features & CURL_VERSION_BROTLI ); lua_rawset(L, -3);
#endif
lua_setfield(L, -2, "features"); /* bitmask, see defines below */ lua_setfield(L, -2, "features"); /* bitmask, see defines below */
@ -140,10 +143,19 @@ static int lcurl_version_info(lua_State *L){
if(data->libidn){lua_pushstring(L, data->libidn); lua_setfield(L, -2, "libidn");} if(data->libidn){lua_pushstring(L, data->libidn); lua_setfield(L, -2, "libidn");}
} }
if(data->age >= CURLVERSION_FOURTH){ /* added in 7.16.1 */ #if LCURL_CURL_VER_GE(7,16,1)
if(data->age >= CURLVERSION_FOURTH){
lua_pushnumber(L, data->iconv_ver_num); lua_setfield(L, -2, "iconv_ver_num"); lua_pushnumber(L, data->iconv_ver_num); lua_setfield(L, -2, "iconv_ver_num");
if(data->libssh_version){lua_pushstring(L, data->libssh_version);lua_setfield(L, -2, "libssh_version");} if(data->libssh_version){lua_pushstring(L, data->libssh_version);lua_setfield(L, -2, "libssh_version");}
} }
#endif
#if LCURL_CURL_VER_GE(7,57,0)
if(data->age >= CURLVERSION_FOURTH){
lua_pushnumber(L, data->brotli_ver_num); lua_setfield(L, -2, "brotli_ver_num");
if(data->brotli_version){lua_pushstring(L, data->brotli_version);lua_setfield(L, -2, "brotli_version");}
}
#endif
if(lua_isstring(L, 1)){ if(lua_isstring(L, 1)){
lua_pushvalue(L, 1); lua_rawget(L, -2); lua_pushvalue(L, 1); lua_rawget(L, -2);