diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2022-12-01 04:22:36 +0300 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2022-12-01 04:22:36 +0300 |
commit | 5eaa67490a43e4f1088b3ebf533559b424f207f1 (patch) | |
tree | 7470dae574b0f74be1c19c6e53b6887b1f73eff8 | |
parent | 39892c6265bb36604bbcbd5e315ec3ee0e91c277 (diff) | |
download | nginx-5eaa67490a43e4f1088b3ebf533559b424f207f1.tar.gz |
Win32: event flags handling edge cases in ngx_wsarecv().
Fixed event flags handling edge cases in ngx_wsarecv() and ngx_wsarecv_chain(),
notably to always reset rev->ready in case of errors (which wasn't the case
after ngx_socket_nread() errors), and after EOF (rev->ready was not cleared
if due to a misconfiguration a zero-sized buffer was used for reading).
-rw-r--r-- | src/os/win32/ngx_wsarecv.c | 2 | ||||
-rw-r--r-- | src/os/win32/ngx_wsarecv_chain.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/os/win32/ngx_wsarecv.c b/src/os/win32/ngx_wsarecv.c index ac883107b..b01405e26 100644 --- a/src/os/win32/ngx_wsarecv.c +++ b/src/os/win32/ngx_wsarecv.c @@ -78,6 +78,7 @@ ngx_wsarecv(ngx_connection_t *c, u_char *buf, size_t size) ngx_socket_nread_n " failed"); if (n == NGX_ERROR) { + rev->ready = 0; rev->error = 1; } @@ -95,6 +96,7 @@ ngx_wsarecv(ngx_connection_t *c, u_char *buf, size_t size) } if (bytes == 0) { + rev->ready = 0; rev->eof = 1; } diff --git a/src/os/win32/ngx_wsarecv_chain.c b/src/os/win32/ngx_wsarecv_chain.c index 4f95d5a2b..e60389bb7 100644 --- a/src/os/win32/ngx_wsarecv_chain.c +++ b/src/os/win32/ngx_wsarecv_chain.c @@ -121,6 +121,7 @@ ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit) } else if (bytes == size) { if (ngx_socket_nread(c->fd, &rev->available) == -1) { + rev->ready = 0; rev->error = 1; ngx_connection_error(c, ngx_socket_errno, ngx_socket_nread_n " failed"); @@ -138,6 +139,7 @@ ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit) } if (bytes == 0) { + rev->ready = 0; rev->eof = 1; } |