Set non-blocking mode on accepted sockets

[vlc] / src / network / httpd.c

diff --git a/src/network/httpd.c b/src/network/httpd.c
index 5504b3b76a4ea1c564f69ef7041e7df505eb241f..9d7d57406c62e0390591eb9383c6a81b02ecd2a0 100644 (file)
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -2509,17 +2509,19 @@ static void httpd_HostThread( httpd_host_t *host )
         {
             httpd_client_t *cl;
             int i_state = -1;
+            int fd = ufd[nfd].fd;
 
-            assert (ufd[nfd].fd == host->fds[nfd]);
+            assert (fd == host->fds[nfd]);
 
             if( ufd[nfd].revents == 0 )
                 continue;
 
             /* */
-            int fd = accept (ufd[nfd].fd, NULL, NULL);
+            fd = accept (fd, NULL, NULL);
             if (fd == -1)
                 continue;
 
+            net_SetupSocket (fd);
             if( p_tls != NULL )
             {
                 switch( tls_ServerSessionHandshake( p_tls, fd ) )