Changeset baffdc120c6a63cc32988535578f44158deb59d5

Show
Ignore:
Timestamp:
04/22/08 17:12:05 (5 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1208877125 +0200
git-parent:

[103061a648dd9585db719da94b6b41daf3408cf4]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1208877106 +0200
Message:

httpd: Fix vlc_object_wait() usage. It's needed to check if we were not already killed before calling vlc_object_wait(). Thanks to William King for spotting the deadlock.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/network/httpd.c

    r449fd28 rbaffdc1  
    24562456        vlc_object_lock( host ); 
    24572457        if( ufd[nfd - 1].revents ) 
    2458             b_die = vlc_object_wait( host ); 
     2458        { 
     2459            b_die = !vlc_object_alive( host ); 
     2460            if( !b_die ) 
     2461                b_die = vlc_object_wait( host ); 
     2462        } 
    24592463        vlc_object_unlock( host ); 
    24602464