aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorHoward Chu <hyc@highlandsun.com>2010-05-21 07:59:12 +0000
committerMartin Storsjö <martin@martin.st>2010-05-21 07:59:12 +0000
commit686d6f40223b528a669b9a346d451c05354cdc5a (patch)
tree0d6aa454a63de296f38ddb9d3eb1eb680854f15f /ffserver.c
parent38d4a2177817117f13ca830e3496b08609378b0c (diff)
downloadffmpeg-686d6f40223b528a669b9a346d451c05354cdc5a.tar.gz
ffserver: Avoid busylooping while reading non-blocking input
Patch by Howard Chu, hyc at highlandsun dot com Originally committed as revision 23210 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffserver.c b/ffserver.c
index 1bb1141723..3cdcd8847c 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2629,6 +2629,7 @@ static int http_receive_data(HTTPContext *c)
ff_neterrno() != FF_NETERROR(EINTR))
/* error : close connection */
goto fail;
+ return 0;
} else if (len == 0) {
/* end of connection : close it */
goto fail;