Commit 3bb6e111 authored by Erwan Tulou's avatar Erwan Tulou
Browse files

net: fix socket blocking if accept4 not available

same options needed for vlc_accept as those for vlc_socket
parent 186273ab
......@@ -636,7 +636,7 @@ int vlc_socket (int pf, int type, int proto, bool nonblock)
if (nonblock)
fd = socket (pf, type | SOCK_NONBLOCK | SOCK_CLOEXEC, proto);
fd = socket (pf, type, proto);
if (fd != -1 || errno != EINVAL)
return fd;
......@@ -693,7 +693,17 @@ int vlc_accept (int lfd, struct sockaddr *addr, socklen_t *alen, bool nonblock)
int fd = accept (lfd, addr, alen);
if (fd != -1)
#ifndef WIN32
fcntl (fd, F_SETFD, FD_CLOEXEC);
if (nonblock)
fcntl (fd, F_SETFL, fcntl (fd, F_GETFL, 0) | O_NONBLOCK);
if (nonblock)
ioctlsocket (fd, FIONBIO, &(unsigned long){ 1 });
return fd;
while (errno == EINTR);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment