summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2019-01-04 19:04:02 +0100
committerMax Kellermann <max@musicpd.org>2019-01-04 19:04:52 +0100
commit1477b64d4f0b7832916e15c4569ca33c38cffaa7 (patch)
tree79372d640c58164a70114ce34e4f419300773eac
parenta2c108f5efb2699ceb05fdaece2a146fc969ebe0 (diff)
parent18c042d4cf5c81edaa7e60d743ce098a1156834e (diff)
Merge branch 'patch-2' of git://github.com/HyShai/MPD
Closes #343
-rw-r--r--NEWS2
-rw-r--r--src/system/EventPipe.cxx2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index cfe1b28c2..1ac9c6156 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ ver 0.21.4 (not yet released)
* output
- httpd: declare protocol "HTTP/1.1" instead of "ICY"
* remove libwrap support
+* Windows
+ - fix "Failed to accept connection: unknown error"
* fix Haiku build
ver 0.21.3 (2018/11/16)
diff --git a/src/system/EventPipe.cxx b/src/system/EventPipe.cxx
index 6d2be2a53..21fc523d9 100644
--- a/src/system/EventPipe.cxx
+++ b/src/system/EventPipe.cxx
@@ -102,7 +102,7 @@ PoorSocketPair(int fd[2])
assert (fd != nullptr);
UniqueSocketDescriptor listen_socket;
- if (!listen_socket.CreateNonBlock(AF_INET, SOCK_STREAM, IPPROTO_TCP))
+ if (!listen_socket.Create(AF_INET, SOCK_STREAM, IPPROTO_TCP))
throw MakeSocketError("Failed to create socket");
if (!listen_socket.Bind(IPv4Address(IPv4Address::Loopback(), 0)))