# HG changeset patch # User Maxim Dounin # Date 1669857756 -10800 # Node ID 56819a9491fe2ee1dcfe4986bed913b894fc0360 # Parent 06c7d84cafdbf8062cecd1150282a6f87c82b700 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). diff -r 06c7d84cafdb -r 56819a9491fe src/os/win32/ngx_wsarecv.c --- a/src/os/win32/ngx_wsarecv.c Thu Dec 01 04:22:31 2022 +0300 +++ b/src/os/win32/ngx_wsarecv.c Thu Dec 01 04:22:36 2022 +0300 @@ -78,6 +78,7 @@ ngx_socket_nread_n " failed"); if (n == NGX_ERROR) { + rev->ready = 0; rev->error = 1; } @@ -95,6 +96,7 @@ } if (bytes == 0) { + rev->ready = 0; rev->eof = 1; } diff -r 06c7d84cafdb -r 56819a9491fe src/os/win32/ngx_wsarecv_chain.c --- a/src/os/win32/ngx_wsarecv_chain.c Thu Dec 01 04:22:31 2022 +0300 +++ b/src/os/win32/ngx_wsarecv_chain.c Thu Dec 01 04:22:36 2022 +0300 @@ -121,6 +121,7 @@ } 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 @@ } if (bytes == 0) { + rev->ready = 0; rev->eof = 1; }