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

Fix. curl_multi_socket_action may invoke easy callbacks before socket callback.

Browse Source
This commit is contained in:
Alexey Melnichuk 2016-09-27 19:01:15 +03:00
parent a836734bfc
commit 9a1270fde6
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lcmulti.c
View File

@ -311,7 +311,7 @@ static int lcurl_multi_socket_action(lua_State *L){
if(s == CURL_SOCKET_TIMEOUT) mask = lutil_optint64(L, 3, 0); if(s == CURL_SOCKET_TIMEOUT) mask = lutil_optint64(L, 3, 0);
else mask = lutil_checkint64(L, 3); else mask = lutil_checkint64(L, 3);
lcurl__multi_assign_lua(L, p, 0); lcurl__multi_assign_lua(L, p, 1);
code = curl_multi_socket_action(p->curl, s, mask, &n); code = curl_multi_socket_action(p->curl, s, mask, &n);
p->L = NULL; p->L = NULL;
@ -470,7 +470,6 @@ static int lcurl_multi_socket_callback(CURL *easy, curl_socket_t s, int what, vo
lutil_pushint64(L, s); lutil_pushint64(L, s);
lua_pushinteger(L, what); lua_pushinteger(L, what);
e->L = L;
if(lua_pcall(L, n+2, 0, 0)){ if(lua_pcall(L, n+2, 0, 0)){
assert(lua_gettop(L) >= top); assert(lua_gettop(L) >= top);
lua_settop(L, top); lua_settop(L, top);