Skip to content

V
vlc-2-2
Commit 90aa64cc authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Ugly fix for httpd deadlock

parent f9b6eba7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
src/network/httpd.c
View file @ 90aa64cc
...@@ -2024,6 +2024,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2024,6 +2024,7 @@ static void httpd_HostThread( httpd_host_t *host )
int evfd; int evfd;
bool b_die; bool b_die;
retry:
vlc_object_lock( host ); vlc_object_lock( host );
evfd = vlc_object_waitpipe( VLC_OBJECT( host ) ); evfd = vlc_object_waitpipe( VLC_OBJECT( host ) );
b_die = !vlc_object_alive( host ); b_die = !vlc_object_alive( host );
...@@ -2035,7 +2036,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2035,7 +2036,7 @@ static void httpd_HostThread( httpd_host_t *host )
{ {
/* 0.2s (FIXME: use a condition variable) */ /* 0.2s (FIXME: use a condition variable) */
msleep( 200000 ); msleep( 200000 );
continue; goto retry;
} }
/* prepare a new TLS session */ /* prepare a new TLS session */
......
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