Backport [15472] and [15473]

src/network/httpd.c

@@ -2437,7 +2437,10 @@ static void httpd_HostThread( httpd_host_t *host )
                 fd = accept( fd, (struct sockaddr *)&sock, &i_sock_size );
                 if( fd >= 0 )
                 {
-                    int i_state = 0;
+                    int i_state = 1;
+
+                    setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, &i_state, sizeof (i_state));
+                    i_state = 0;
 
                     /* set this new socket non-block */
 #if defined( WIN32 ) || defined( UNDER_CE )

src/network/tcp.c

@@ -418,6 +418,9 @@ int __net_Accept( vlc_object_t *p_this, int *pi_fd, mtime_t i_wait )
                          net_strerror( net_errno ) );
             else
             {
+                const int yes = 1;
+                setsockopt( i_fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof( yes ));
+
                 /*
                  * This round-robin trick ensures that the first sockets in
                  * pi_fd won't prevent the last ones from getting accept'ed.