[MPlayer-cvslog] r33808 - trunk/stream/stream.c

[reimar]

Author: reimar
Date: Mon Jul  4 21:14:06 2011
New Revision: 33808

Log:
Pass streaming_ctrl eof on.

Fixes a possible endless loop with HTTP files where seeking to
the very end returns the full file again instead of e.g. an error.
Apache/2.2.4 seems to show this behaviour.

Modified:
   trunk/stream/stream.c

Modified: trunk/stream/stream.c
==============================================================================
--- trunk/stream/stream.c	Mon Jul  4 21:11:21 2011	(r33807)
+++ trunk/stream/stream.c	Mon Jul  4 21:14:06 2011	(r33808)
@@ -290,6 +290,8 @@ int stream_read_internal(stream_t *s, vo
 #ifdef CONFIG_NETWORKING
     if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) {
       len=s->streaming_ctrl->streaming_read(s->fd, buf, len, s->streaming_ctrl);
+      if (s->streaming_ctrl->status == streaming_stopped_e)
+        s->eof = 1;
     } else
 #endif
     if (s->fill_buffer)