Merge [PATCH] http chunked encoding fix

diff --git a/THANKS b/THANKS
index 1550c9313ea3d20279b1f5cc0b89323f8e3acbc3..2e8b3e406d2df9da5bef5c97db8e005f861e1b19 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -61,6 +61,7 @@ Eurodata Computer Club <retron.info> - VLC icon design (v0.8.4)
 François Seingier <francois.seingier at club-internet.fr> - TTL setting in the wx stream output dialog
 Frank Chao <frank0624 at gmail.com> - Chinese Traditional translation
 Fumio Nakayama <endymion at ca2.so-net.ne.jp> - Japanese translation
+Georgi Chorbadzhiyski <gf at unixsol dot org> - HTTP access error handling fix
 Greg Farrell <greg at gregfarell dot org> - rc interface "enqueue" command
 Gregory Hazel <ghazel at gmail dot com> - wxWidgets fixes and improvements
 Goetz Waschk <waschk at informatik.uni-rostock dot de> - Mandrake packages

diff --git a/modules/access/http.c b/modules/access/http.c
index b0c2044789e00c44f18dee437cef72b0b18d20f8..5d374f950d71663f7eec3399540d15a15b24325e 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -487,8 +487,9 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
             /* read the chunk header */
             if( psz == NULL )
             {
+                /* fatal error - end of file */
                 msg_Dbg( p_access, "failed reading chunk-header line" );
-                return -1;
+                return 0;
             }
             p_sys->i_chunk = strtoll( psz, NULL, 16 );
             free( psz );