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

Implement setopt_proxytype in Lua-cURL interface.

Browse Source 
Add. PROXY_XXX constants.
This commit is contained in:
Alexey Melnichuk 2014-08-29 15:06:36 +05:00
parent 91007775d8
commit 917ca411c5
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
msvc/lcurl.vcproj
View File

@ -239,6 +239,10 @@
RelativePath="..\src\lcerror.h"
>
</File>
<File
RelativePath="..\src\lcflags.h"
>
</File>
<File
RelativePath="..\src\lchttppost.h"
>

7
src/lcflags.h
View File

@ -111,3 +111,10 @@ FLG_ENTRY(PROTO_RTMPS )
FLG_ENTRY(PROTO_RTMPTS )
FLG_ENTRY(PROTO_GOPHER )
FLG_ENTRY(PROTO_ALL )
FLG_ENTRY(PROXY_HTTP ) /* added in 7.10.0 */
FLG_ENTRY(PROXY_HTTP_1_0 ) /* added in 7.19.4 */
FLG_ENTRY(PROXY_SOCKS4 ) /* added in 7.15.2 */
FLG_ENTRY(PROXY_SOCKS5 ) /* added in 7.10.0 */
FLG_ENTRY(PROXY_SOCKS4A ) /* added in 7.18.0 */
FLG_ENTRY(PROXY_SOCKS5_HOSTNAME ) /* added in 7.18.0 */

29
src/lua/cURL.lua
View File

@ -12,6 +12,16 @@ local function wrap_function(k)
end
end
local function wrap_setopt_flags(k, flags)
k = "setopt_" .. k
return function(self, v)
v = assert(flags[v], "Unsupported value " .. tostring(v))
local ok, err = self._handle[k](self._handle, v)
if ok == self._handle then return self end
return ok, err
end
end
-------------------------------------------
local Easy = {} do
@ -109,6 +119,15 @@ function Easy:setopt_share(s)
return setopt_share(self, s:handle())
end
Easy.setopt_proxytype = wrap_setopt_flags("proxytype", {
["HTTP" ] = curl.PROXY_HTTP;
["HTTP_1_0" ] = curl.PROXY_HTTP_1_0;
["SOCKS4" ] = curl.PROXY_SOCKS4;
["SOCKS5" ] = curl.PROXY_SOCKS5;
["SOCKS4A" ] = curl.PROXY_SOCKS4A;
["SOCKS5_HOSTNAME" ] = curl.PROXY_SOCKS5_HOSTNAME;
})
end
-------------------------------------------
@ -242,17 +261,11 @@ function Share:handle()
return self._handle
end
local setopt_share = wrap_function("setopt_share")
local SHARE_FLAGS = {
Share.setopt_share = wrap_setopt_flags("share", {
[ "COOKIE" ] = curl.LOCK_DATA_COOKIE;
[ "DNS" ] = curl.LOCK_DATA_DNS;
[ "SSL_SESSION" ] = curl.LOCK_DATA_SSL_SESSION;
}
function Share:setopt_share(k)
return setopt_share(self, assert(SHARE_FLAGS[k]))
end
})
end
-------------------------------------------