0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-14 09:47:56 +08:00

Merge pull request #3297 from toonetown/recv-buffer-overflow

Windows apparently returns `WSAENOBUFS` from `recv`
This commit is contained in:
Luca Boccassi 2018-11-06 10:37:59 +00:00 committed by GitHub
commit 2327661810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions

17
RELICENSE/toonetown.md Normal file
View File

@ -0,0 +1,17 @@
# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
This is a statement by Nathan Toone that grants permission to
relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
approved license chosen by the current ZeroMQ BDFL (Benevolent
Dictator for Life).
A portion of the commits made by the Github handle "toonetown", with
commit author "Nathan Toone <nathan@toonetown.com>", are
copyright of Nathan Toone. This document hereby grants the libzmq
project team to relicense libzmq, including all past, present and
future contributions of the author listed above.
Nathan Toone
2018/11/05

View File

@ -284,7 +284,7 @@ int zmq::tcp_read (fd_t s_, void *data_, size_t size_)
last_error == WSAENETDOWN || last_error == WSAENETRESET
|| last_error == WSAECONNABORTED || last_error == WSAETIMEDOUT
|| last_error == WSAECONNRESET || last_error == WSAECONNREFUSED
|| last_error == WSAENOTCONN);
|| last_error == WSAENOTCONN || last_error == WSAENOBUFS);
errno = wsa_error_to_errno (last_error);
}
}