From 1361e87e8074e9cb129bb7a0e7b69d3c29f4da2e Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Thu, 25 Nov 2010 16:08:24 +0100 Subject: [PATCH] Fix error reporting and EAGAIN handling bug in net Write Clarify some comments as well --- src/node_net.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/node_net.cc b/src/node_net.cc index d4de4041d4..7a07f55115 100644 --- a/src/node_net.cc +++ b/src/node_net.cc @@ -677,8 +677,9 @@ static Handle Read(const Arguments& args) { } #else // __MINGW32__ /* - * read() should work for in mingw, but always gives EINVAL; someone should really file a bug about it. - * We'll use recv() however, it's faster as well. + * read() _should_ work for sockets in mingw, but always gives EINVAL; + * someone should really file a bug about it. + * We'll use recv() for sockets however, it's faster as well. */ ssize_t bytes_read = recv(_get_osfhandle(fd), (char*)buffer_data + off, len, 0); @@ -897,14 +898,15 @@ static Handle Write(const Arguments& args) { } #else // __MINGW32__ /* - * write() should work for sockets in mingw, but always gives EINVAL; someone should really file a bug about it. - * We'll use send() however, it's faster as well. + * write() _should_ work for sockets in mingw, but always gives EINVAL; + * someone should really file a bug about it. + * We'll use send() for sockets however, it's faster as well. */ ssize_t written = send(_get_osfhandle(fd), buffer_data + off, len, 0); if (written < 0) { int wsaErrno = WSAGetLastError(); - if (errno == WSAEWOULDBLOCK || errno == WSAEINTR) { + if (wsaErrno == WSAEWOULDBLOCK || wsaErrno == WSAEINTR) { return scope.Close(Integer::New(0)); } return ThrowException(ErrnoException(wsaErrno, "write"));