dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2025-05-01 04:36:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: dany:54405e456b3411401cd7a2abb86c2f87757a2ea8
Branches Tags
dany:master
dany:hjelmeland-patch-1
dany:feature/compiler-override
dany:issue297
dany:revert-256-luasocket254
dany:v3.1.0
dany:v3.0.0
dany:v3.0-rc1
dany:v2.0.2
..
compare: dany:4143f83f1263f6113832d78dd25f7ae297a45108
Branches Tags
dany:master
dany:hjelmeland-patch-1
dany:feature/compiler-override
dany:issue297
dany:revert-256-luasocket254
dany:v3.1.0
dany:v3.0.0
dany:v3.0-rc1
dany:v2.0.2

1 Commits
54405e456b ... 4143f83f12

Author SHA1 Message Date
Miku AuahDark
4143f83f12
Merge 585fa75aa0b3f0148a687b7bafcadbfa5514f33e into bef62aeb503422d70ccb04fd65d26e6cb9bc2cb1 2023-11-08 23:34:44 +08:00
2 changed files with 1 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
src/url.lua
View File

@ -152,7 +152,7 @@ function _M.parse(url, default)
url = string.gsub(url, "^([%w][%w%+%-%.]*)%:", url = string.gsub(url, "^([%w][%w%+%-%.]*)%:",
function(s) parsed.scheme = s; return "" end) function(s) parsed.scheme = s; return "" end)
-- get authority -- get authority
url = string.gsub(url, "^//([^/%?#]*)", function(n) url = string.gsub(url, "^//([^/]*)", function(n)
parsed.authority = n parsed.authority = n
return "" return ""
end) end)

2
src/wsocket.c
View File

@ -262,7 +262,6 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got,
if (err != WSAEWOULDBLOCK) { if (err != WSAEWOULDBLOCK) {
if (err != WSAECONNRESET || prev == WSAECONNRESET) return err; if (err != WSAECONNRESET || prev == WSAECONNRESET) return err;
prev = err; prev = err;
continue;
} }
if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err; if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
} }
@ -292,7 +291,6 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
if (err != WSAEWOULDBLOCK) { if (err != WSAEWOULDBLOCK) {
if (err != WSAECONNRESET || prev == WSAECONNRESET) return err; if (err != WSAECONNRESET || prev == WSAECONNRESET) return err;
prev = err; prev = err;
continue;
} }
if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err; if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
} }