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

Change. info_read could automatically remove easy handle if it done.

Browse Source
This commit is contained in:
Alexey Melnichuk 2014-09-01 10:20:25 +05:00
parent dcc027c29a
commit 0b398a6727
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/lcurl.ldoc
View File

@ -343,6 +343,9 @@ function perfom() end
--- Read multi stack informationals. --- Read multi stack informationals.
-- --
-- Note. If curl_multi_remove_handle fail then there no error occure but handle jast stay in multi handle.
--
-- @tparam[opt] remove remove easy handle if it done.
-- @treturn[1] number 0 there no informationals -- @treturn[1] number 0 there no informationals
-- @treturn[2] easy handle -- @treturn[2] easy handle
-- @treturn[2] boolean true -- @treturn[2] boolean true

9
src/lcmulti.c
View File

@ -101,6 +101,8 @@ static int lcurl_multi_info_read(lua_State *L){
lcurl_multi_t *p = lcurl_getmulti(L); lcurl_multi_t *p = lcurl_getmulti(L);
int msgs_in_queue = 0; int msgs_in_queue = 0;
CURLMsg *msg = curl_multi_info_read(p->curl, &msgs_in_queue); CURLMsg *msg = curl_multi_info_read(p->curl, &msgs_in_queue);
int remove = lua_toboolean(L, 2);
lcurl_easy_t *e; lcurl_easy_t *e;
if(!msg){ if(!msg){
lua_pushnumber(L, msgs_in_queue); lua_pushnumber(L, msgs_in_queue);
@ -111,6 +113,13 @@ static int lcurl_multi_info_read(lua_State *L){
lua_rawgeti(L, LCURL_LUA_REGISTRY, p->h_ref); lua_rawgeti(L, LCURL_LUA_REGISTRY, p->h_ref);
lua_rawgetp(L, -1, msg->easy_handle); lua_rawgetp(L, -1, msg->easy_handle);
e = lcurl_geteasy_at(L, -1); e = lcurl_geteasy_at(L, -1);
if(remove){
//! @fixme We ignore any errors
if(CURLM_OK == curl_multi_remove_handle(p->curl, e->curl)){
lua_pushnil(L);
lua_rawsetp(L, -3, e->curl);
}
}
if(msg->data.result == CURLE_OK){ if(msg->data.result == CURLE_OK){
lua_pushboolean(L, 1); lua_pushboolean(L, 1);
return 2; return 2;