[vlc-devel] commit: Ugly fix for httpd deadlock ( Rémi Denis-Courmont )

git version control git at videolan.org
Fri May 9 17:34:49 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Fri May  9 18:34:41 2008 +0300| [90aa64cc1cfa26c51713efcec08cb22d41530477]

Ugly fix for httpd deadlock

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=90aa64cc1cfa26c51713efcec08cb22d41530477
---

 src/network/httpd.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/network/httpd.c b/src/network/httpd.c
index 544410c..6ddd9da 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -2024,6 +2024,7 @@ static void httpd_HostThread( httpd_host_t *host )
     int evfd;
     bool b_die;
 
+retry:
     vlc_object_lock( host );
     evfd = vlc_object_waitpipe( VLC_OBJECT( host ) );
     b_die = !vlc_object_alive( host );
@@ -2035,7 +2036,7 @@ static void httpd_HostThread( httpd_host_t *host )
         {
             /* 0.2s (FIXME: use a condition variable) */
             msleep( 200000 );
-            continue;
+            goto retry;
         }
 
         /* prepare a new TLS session */




More information about the vlc-devel mailing list