Skip to content

Commit 5fae338

Browse files
committed
Fix. easy:reset() returns correct value
1 parent 171aa24 commit 5fae338

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

examples/cURLv3/uvwget.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,8 @@ local curl_check_multi_info = function()
230230

231231
if ok then on_end(easy, nil, done_url) else on_end(easy, err, done_url) end
232232

233-
easy:reset().data = nil
233+
easy:reset()
234+
easy.data = nil
234235
qfree:push(easy)
235236
end
236237

src/lceasy.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ static int lcurl_easy_reset(lua_State *L){
240240
if(p->storage != LUA_NOREF){
241241
lcurl_storage_free(L, p->storage);
242242
p->storage = lcurl_storage_init(L);
243+
lua_settop(L, 1);
243244
}
244245

245246
return 1;

test/test_easy.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ function test_unset()
885885
gc_collect()
886886
assert(pfrom.value)
887887

888-
e:unsetopt_httppost()
888+
assert_equal(e, e:unsetopt_httppost())
889889

890890
gc_collect()
891891
assert(not pfrom.value)
@@ -902,7 +902,7 @@ function test_reset()
902902
gc_collect()
903903
assert(pfrom.value)
904904

905-
e:reset()
905+
assert_equal(e, e:reset())
906906

907907
gc_collect()
908908
assert(not pfrom.value)

0 commit comments

Comments
 (0)