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

Support new options from 7.65.1

Browse Source
This commit is contained in:
Alexey Melnichuk 2019-06-23 15:42:58 +03:00
parent e0b1d2ee3d
commit 6facbae1a0
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

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

8
src/lcopteasy.h
View File

@ -88,7 +88,11 @@ OPT_ENTRY( interface, INTERFACE, STR, LCURL_STORE_ST
OPT_ENTRY( localport, LOCALPORT, LNG, 0, LCURL_DEFAULT_VALUE ) OPT_ENTRY( localport, LOCALPORT, LNG, 0, LCURL_DEFAULT_VALUE )
OPT_ENTRY( localportrange, LOCALPORTRANGE, LNG, 0, 1 ) OPT_ENTRY( localportrange, LOCALPORTRANGE, LNG, 0, 1 )
OPT_ENTRY( dns_cache_timeout, DNS_CACHE_TIMEOUT, LNG, 0, 60 ) OPT_ENTRY( dns_cache_timeout, DNS_CACHE_TIMEOUT, LNG, 0, 60 )
#if !LCURL_CURL_VER_GE(7,65,0)
OPT_ENTRY( dns_use_global_cache, DNS_USE_GLOBAL_CACHE, LNG, 0, LCURL_DEFAULT_VALUE ) OPT_ENTRY( dns_use_global_cache, DNS_USE_GLOBAL_CACHE, LNG, 0, LCURL_DEFAULT_VALUE )
#endif
#if LCURL_CURL_VER_GE(7,25,0) #if LCURL_CURL_VER_GE(7,25,0)
OPT_ENTRY( dns_servers, DNS_SERVERS, STR, LCURL_STORE_STRING, LCURL_DEFAULT_VALUE ) OPT_ENTRY( dns_servers, DNS_SERVERS, STR, LCURL_STORE_STRING, LCURL_DEFAULT_VALUE )
#endif #endif
@ -457,6 +461,10 @@ OPT_ENTRY(doh_url, DOH_URL, STR, 0, LCURL_DEFA
OPT_ENTRY(upload_buffersize, UPLOAD_BUFFERSIZE, LNG, 0, 64 * 1024) OPT_ENTRY(upload_buffersize, UPLOAD_BUFFERSIZE, LNG, 0, 64 * 1024)
#endif #endif
#if LCURL_CURL_VER_GE(7,65,0)
OPT_ENTRY(maxage_conn, MAXAGE_CONN, LNG, 0, LCURL_DEFAULT_VALUE)
#endif
//{ Restore system macros //{ Restore system macros
#ifdef LCURL__TCP_FASTOPEN #ifdef LCURL__TCP_FASTOPEN

1
src/lcopturl.h
View File

@ -8,6 +8,7 @@ ENTRY_PART(query, UPART_QUERY , CURLUE_NO_QUERY )
ENTRY_PART(scheme, UPART_SCHEME , CURLUE_NO_SCHEME ) ENTRY_PART(scheme, UPART_SCHEME , CURLUE_NO_SCHEME )
ENTRY_PART(url, UPART_URL , CURLUE_OK ) ENTRY_PART(url, UPART_URL , CURLUE_OK )
ENTRY_PART(user, UPART_USER , CURLUE_NO_USER ) ENTRY_PART(user, UPART_USER , CURLUE_NO_USER )
ENTRY_PART(zoneid, UPART_ZONEID , CURLUE_UNKNOWN_PART )
ENTRY_FLAG(DEFAULT_PORT ) ENTRY_FLAG(DEFAULT_PORT )
ENTRY_FLAG(NO_DEFAULT_PORT ) ENTRY_FLAG(NO_DEFAULT_PORT )

16
test/test_urlapi.lua
View File

@ -211,6 +211,22 @@ end)
-- assert_equal("http://example.com/?a=hello+world", url:get_url()) -- assert_equal("http://example.com/?a=hello+world", url:get_url())
-- end) -- end)
if curl.UPART_ZONEID then
it('should returns zoneid', function()
url = scurl.url('http://[fe80:3438:7667:5c77:ce27%18]:3800')
assert_equal('18', url:get_zoneid())
end)
it('should returns empty on missing zoneid', function()
url = scurl.url('http://[fe80:3438:7667:5c77:ce27]:3800')
assert_equal(curl.null, url:get_zoneid())
end)
else
test_zoneid = skip_case('URL API supports zoneid since version 7.65.0')
end
end end end end
local _ENV = TEST_CASE'curlu parameter' if ENABLE then local _ENV = TEST_CASE'curlu parameter' if ENABLE then