diff options
| author | Thijs Schreijer <thijs@thijsschreijer.nl> | 2026-08-29 19:59:33 +0200 |
|---|---|---|
| committer | Thijs Schreijer <thijs@thijsschreijer.nl> | 2026-08-30 08:46:47 +0200 |
| commit | e21720da69f2a505bcd1405cc7e8b52d5649df55 (patch) | |
| tree | b37bd8a78ba484dd9987b306a50d391315f639ab /src/usocket.c | |
| parent | 827ae20771d34912a8f79b50dc68e6430945b9eb (diff) | |
| download | luasocket-e21720da69f2a505bcd1405cc7e8b52d5649df55.tar.gz luasocket-e21720da69f2a505bcd1405cc7e8b52d5649df55.tar.bz2 luasocket-e21720da69f2a505bcd1405cc7e8b52d5649df55.zip | |
fix(receive): a receive 0 should immediately return, not block
The fix is slightly more complex because reading from a closed
socket should still return a closed-error.
fixes: #427
fixes: https://github.com/ledgetech/lua-resty-http/pull/313
Diffstat (limited to 'src/usocket.c')
| -rw-r--r-- | src/usocket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/usocket.c b/src/usocket.c index 7965db6..e00c43d 100644 --- a/src/usocket.c +++ b/src/usocket.c | |||
| @@ -258,6 +258,7 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm | |||
| 258 | int err; | 258 | int err; |
| 259 | *got = 0; | 259 | *got = 0; |
| 260 | if (*ps == SOCKET_INVALID) return IO_CLOSED; | 260 | if (*ps == SOCKET_INVALID) return IO_CLOSED; |
| 261 | if (count == 0) return IO_DONE; | ||
| 261 | for ( ;; ) { | 262 | for ( ;; ) { |
| 262 | long taken = (long) recv(*ps, data, count, 0); | 263 | long taken = (long) recv(*ps, data, count, 0); |
| 263 | if (taken > 0) { | 264 | if (taken > 0) { |
| @@ -343,6 +344,7 @@ int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm | |||
| 343 | int err; | 344 | int err; |
| 344 | *got = 0; | 345 | *got = 0; |
| 345 | if (*ps == SOCKET_INVALID) return IO_CLOSED; | 346 | if (*ps == SOCKET_INVALID) return IO_CLOSED; |
| 347 | if (count == 0) return IO_DONE; | ||
| 346 | for ( ;; ) { | 348 | for ( ;; ) { |
| 347 | long taken = (long) read(*ps, data, count); | 349 | long taken = (long) read(*ps, data, count); |
| 348 | if (taken > 0) { | 350 | if (taken > 0) { |
