X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fhttp.c;h=dec0de80221949b226cf7e37948e9431023648b1;hb=fa4bde0b26a6c7a2a617362ea0b17144686e39fe;hp=d8715c5930b57092c2817f234f173b700f4f4284;hpb=27d483e9ef7a451397d7857251c8d67097661f1d;p=vlc

diff --git a/modules/access/http.c b/modules/access/http.c
index d8715c5930..dec0de8022 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 
@@ -43,6 +43,7 @@
 #include <vlc_url.h>
 #include <vlc_tls.h>
 #include <vlc_strings.h>
+#include <vlc_charset.h>
 #include <vlc_input.h>
 #include <vlc_md5.h>
 
@@ -50,6 +51,11 @@
 #   include <zlib.h>
 #endif
 
+#include <assert.h>
+
+#ifdef HAVE_LIBPROXY
+#    include <proxy.h>
+#endif
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -59,9 +65,13 @@ static void Close( vlc_object_t * );
 #define PROXY_TEXT N_("HTTP proxy")
 #define PROXY_LONGTEXT N_( \
     "HTTP proxy to be used It must be of the form " \
-    "http://[user[:pass]@]myproxy.mydomain:myport/ ; " \
+    "http://[user@]myproxy.mydomain:myport/ ; " \
     "if empty, the http_proxy environment variable will be tried." )
 
+#define PROXY_PASS_TEXT N_("HTTP proxy password")
+#define PROXY_PASS_LONGTEXT N_( \
+    "If your HTTP proxy requires a password, set it here." )
+
 #define CACHING_TEXT N_("Caching value in ms")
 #define CACHING_LONGTEXT N_( \
     "Caching value for HTTP streams. This " \
@@ -83,35 +93,37 @@ static void Close( vlc_object_t * );
     "types of HTTP streams." )
 
 #define FORWARD_COOKIES_TEXT N_("Forward Cookies")
-#define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies Across http redirections ")
+#define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies across http redirections ")
 
-vlc_module_begin();
-    set_description( _("HTTP input") );
-    set_capability( "access", 0 );
-    set_shortname( _( "HTTP(S)" ) );
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_ACCESS );
+vlc_module_begin ()
+    set_description( N_("HTTP input") )
+    set_capability( "access", 0 )
+    set_shortname( N_( "HTTP(S)" ) )
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_ACCESS )
 
     add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT,
-                false );
+                false )
+    add_password( "http-proxy-pwd", NULL, NULL,
+                  PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false )
     add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
-                 CACHING_TEXT, CACHING_LONGTEXT, true );
+                 CACHING_TEXT, CACHING_LONGTEXT, true )
     add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT,
-                AGENT_LONGTEXT, true );
+                AGENT_LONGTEXT, true )
     add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT,
-              RECONNECT_LONGTEXT, true );
+              RECONNECT_LONGTEXT, true )
     add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT,
-              CONTINUOUS_LONGTEXT, true );
-    add_bool( "http-forward-cookies", 0, NULL, FORWARD_COOKIES_TEXT,
-              FORWARD_COOKIES_LONGTEXT, true );
-    add_obsolete_string("http-user");
-    add_obsolete_string("http-pwd");
-    add_shortcut( "http" );
-    add_shortcut( "https" );
-    add_shortcut( "unsv" );
-    add_shortcut( "itpc" ); /* iTunes Podcast */
-    set_callbacks( Open, Close );
-vlc_module_end();
+              CONTINUOUS_LONGTEXT, true )
+    add_bool( "http-forward-cookies", true, NULL, FORWARD_COOKIES_TEXT,
+              FORWARD_COOKIES_LONGTEXT, true )
+    add_obsolete_string("http-user")
+    add_obsolete_string("http-pwd")
+    add_shortcut( "http" )
+    add_shortcut( "https" )
+    add_shortcut( "unsv" )
+    add_shortcut( "itpc" ) /* iTunes Podcast */
+    set_callbacks( Open, Close )
+vlc_module_end ()
 
 /*****************************************************************************
  * Local prototypes
@@ -147,6 +159,7 @@ struct access_sys_t
     bool b_proxy;
     vlc_url_t  proxy;
     http_auth_t proxy_auth;
+    char       *psz_proxy_passbuf;
 
     /* */
     int        i_code;
@@ -172,16 +185,18 @@ struct access_sys_t
     int64_t    i_chunk;
 
     int        i_icy_meta;
+    int64_t    i_icy_offset;
     char       *psz_icy_name;
     char       *psz_icy_genre;
     char       *psz_icy_title;
 
-    int i_remaining;
+    int64_t i_remaining;
 
     bool b_seekable;
     bool b_reconnect;
     bool b_continuous;
     bool b_pace_control;
+    bool b_persist;
 
     vlc_array_t * cookies;
 };
@@ -239,6 +254,7 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies )
 #endif
     p_sys->fd = -1;
     p_sys->b_proxy = false;
+    p_sys->psz_proxy_passbuf = NULL;
     p_sys->i_version = 1;
     p_sys->b_seekable = true;
     p_sys->psz_mime = NULL;
@@ -262,10 +278,15 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies )
     p_sys->p_tls = NULL;
     p_sys->p_vs = NULL;
     p_sys->i_icy_meta = 0;
+    p_sys->i_icy_offset = 0;
     p_sys->psz_icy_name = NULL;
     p_sys->psz_icy_genre = NULL;
     p_sys->psz_icy_title = NULL;
     p_sys->i_remaining = 0;
+    p_sys->b_persist = false;
+    p_access->info.i_size = -1;
+    p_access->info.i_pos  = 0;
+    p_access->info.b_eof  = false;
 
     p_sys->cookies = saved_cookies;
 
@@ -298,24 +319,63 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies )
     p_sys->psz_user_agent = var_CreateGetString( p_access, "http-user-agent" );
 
     /* Check proxy */
-    psz = var_CreateGetString( p_access, "http-proxy" );
-    if( *psz )
+    psz = var_CreateGetNonEmptyString( p_access, "http-proxy" );
+    if( psz )
     {
         p_sys->b_proxy = true;
         vlc_UrlParse( &p_sys->proxy, psz, 0 );
+        free( psz );
     }
-#ifdef HAVE_GETENV
+#ifdef HAVE_LIBPROXY
     else
     {
-        char *psz_proxy = getenv( "http_proxy" );
-        if( psz_proxy && *psz_proxy )
+        pxProxyFactory *pf = px_proxy_factory_new();
+        if (pf)
+        {
+            char *buf;
+            int i;
+            i=asprintf(&buf, "%s://%s", p_access->psz_access, p_access->psz_path);
+            if (i >= 0)
+            {
+                msg_Dbg(p_access, "asking libproxy about url '%s'", buf);
+                char **proxies = px_proxy_factory_get_proxies(pf, buf);
+                if (proxies[0])
+                {
+                    msg_Dbg(p_access, "libproxy suggest to use '%s'", proxies[0]);
+                    if(strcmp(proxies[0],"direct://") != 0)
+                    {
+                        p_sys->b_proxy = true;
+                        vlc_UrlParse( &p_sys->proxy, proxies[0], 0);
+                    }
+                }
+                for(i=0;proxies[i];i++) free(proxies[i]);
+                free(proxies);
+                free(buf);
+            }
+            px_proxy_factory_free(pf);
+        }
+        else
+        {
+            msg_Err(p_access, "Allocating memory for libproxy failed");
+        }
+    }
+#elif HAVE_GETENV
+    else
+    {
+        psz = getenv( "http_proxy" );
+        if( psz )
         {
             p_sys->b_proxy = true;
-            vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 );
+            vlc_UrlParse( &p_sys->proxy, psz, 0 );
         }
     }
 #endif
-    free( psz );
+    if( psz ) /* No, this is NOT a use-after-free error */
+    {
+        psz = var_CreateGetNonEmptyString( p_access, "http-proxy-pwd" );
+        if( psz )
+            p_sys->proxy.psz_password = p_sys->psz_proxy_passbuf = psz;
+    }
 
     if( p_sys->b_proxy )
     {
@@ -339,8 +399,7 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies )
     }
     if( p_sys->url.psz_username && *p_sys->url.psz_username )
     {
-        msg_Dbg( p_access, "      user='%s', pwd='%s'",
-                 p_sys->url.psz_username, p_sys->url.psz_password );
+        msg_Dbg( p_access, "      user='%s'", p_sys->url.psz_username );
     }
 
     p_sys->b_reconnect = var_CreateGetBool( p_access, "http-reconnect" );
@@ -359,7 +418,7 @@ connect:
             p_sys->i_version = 0;
             p_sys->b_seekable = false;
 
-            if( p_access->b_die || Connect( p_access, 0 ) )
+            if( !vlc_object_alive (p_access) || Connect( p_access, 0 ) )
                 goto error;
 
 #ifndef NDEBUG
@@ -374,13 +433,14 @@ connect:
 
     if( p_sys->i_code == 401 )
     {
-        char *psz_login = NULL; char *psz_password = NULL;
+        char *psz_login = NULL, *psz_password = NULL;
         char psz_msg[250];
         int i_ret;
         /* FIXME ? */
         if( p_sys->url.psz_username && p_sys->url.psz_password &&
             p_sys->auth.psz_nonce && p_sys->auth.i_nonce == 0 )
         {
+            Disconnect( p_access );
             goto connect;
         }
         snprintf( psz_msg, 250,
@@ -398,6 +458,7 @@ connect:
             if( psz_password ) p_sys->url.psz_password = strdup( psz_password );
             free( psz_login );
             free( psz_password );
+            Disconnect( p_access );
             goto connect;
         }
         else
@@ -428,6 +489,7 @@ connect:
         vlc_UrlClean( &p_sys->url );
         AuthReset( &p_sys->auth );
         vlc_UrlClean( &p_sys->proxy );
+        free( p_sys->psz_proxy_passbuf );
         AuthReset( &p_sys->proxy_auth );
         free( p_sys->psz_mime );
         free( p_sys->psz_pragma );
@@ -454,12 +516,21 @@ connect:
         {
             if( !strcasecmp( p_sys->psz_mime, "video/nsv" ) ||
                 !strcasecmp( p_sys->psz_mime, "video/nsa" ) )
+            {
+                free( p_access->psz_demux );
                 p_access->psz_demux = strdup( "nsv" );
+            }
             else if( !strcasecmp( p_sys->psz_mime, "audio/aac" ) ||
                      !strcasecmp( p_sys->psz_mime, "audio/aacp" ) )
+            {
+                free( p_access->psz_demux );
                 p_access->psz_demux = strdup( "m4a" );
+            }
             else if( !strcasecmp( p_sys->psz_mime, "audio/mpeg" ) )
+            {
+                free( p_access->psz_demux );
                 p_access->psz_demux = strdup( "mp3" );
+            }
 
             msg_Info( p_access, "Raw-audio server found, %s demuxer selected",
                       p_access->psz_demux );
@@ -472,8 +543,9 @@ connect:
         }
         else if( !p_sys->psz_mime )
         {
-             /* Shoutcast */
-             p_access->psz_demux = strdup( "mp3" );
+            free( p_access->psz_demux );
+            /* Shoutcast */
+            p_access->psz_demux = strdup( "mp3" );
         }
         /* else probably Ogg Vorbis */
     }
@@ -481,17 +553,22 @@ connect:
              p_sys->psz_mime &&
              !strcasecmp( p_sys->psz_mime, "misc/ultravox" ) )
     {
+        free( p_access->psz_demux );
         /* Grrrr! detect ultravox server and force NSV demuxer */
         p_access->psz_demux = strdup( "nsv" );
     }
     else if( !strcmp( p_access->psz_access, "itpc" ) )
     {
+        free( p_access->psz_demux );
         p_access->psz_demux = strdup( "podcast" );
     }
     else if( p_sys->psz_mime &&
              !strncasecmp( p_sys->psz_mime, "application/xspf+xml", 20 ) &&
              ( memchr( " ;\t", p_sys->psz_mime[20], 4 ) != NULL ) )
+    {
+        free( p_access->psz_demux );
         p_access->psz_demux = strdup( "xspf-open" );
+    }
 
     if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" );
 
@@ -503,6 +580,7 @@ connect:
 error:
     vlc_UrlClean( &p_sys->url );
     vlc_UrlClean( &p_sys->proxy );
+    free( p_sys->psz_proxy_passbuf );
     free( p_sys->psz_mime );
     free( p_sys->psz_pragma );
     free( p_sys->psz_location );
@@ -564,13 +642,13 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
     access_sys_t *p_sys = p_access->p_sys;
     int i_read;
 
-    if( p_sys->fd < 0 )
+    if( p_sys->fd == -1 )
     {
         p_access->info.b_eof = true;
         return 0;
     }
 
-    if( p_access->info.i_size > 0 &&
+    if( p_access->info.i_size >= 0 &&
         i_len + p_access->info.i_pos > p_access->info.i_size )
     {
         if( ( i_len = p_access->info.i_size - p_access->info.i_pos ) == 0 )
@@ -614,24 +692,20 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
             i_len = p_sys->i_chunk;
         }
     }
-
-    if( p_sys->b_continuous && (ssize_t)i_len > p_sys->i_remaining )
-    {
+    else if( p_access->info.i_size != -1 && (int64_t)i_len > p_sys->i_remaining) {
         /* Only ask for the remaining length */
-        int i_new_len = p_sys->i_remaining;
-        if( i_new_len == 0 )
-        {
-            Request( p_access, 0 );
-            i_read = Read( p_access, p_buffer, i_len );
-            return i_read;
+        i_len = (size_t)p_sys->i_remaining;
+        if(i_len == 0) {
+            p_access->info.b_eof = true;
+            return 0;
         }
-        i_len = i_new_len;
     }
 
-    if( p_sys->i_icy_meta > 0 && p_access->info.i_pos > 0 )
+
+    if( p_sys->i_icy_meta > 0 && p_access->info.i_pos-p_sys->i_icy_offset > 0 )
     {
         int64_t i_next = p_sys->i_icy_meta -
-                                    p_access->info.i_pos % p_sys->i_icy_meta;
+                                    (p_access->info.i_pos - p_sys->i_icy_offset ) % p_sys->i_icy_meta;
 
         if( i_next == p_sys->i_icy_meta )
         {
@@ -696,7 +770,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
         if( i_read == 0 ) p_access->info.b_eof = true;
     }
 
-    if( p_sys->b_continuous )
+    if( p_access->info.i_size != -1 )
     {
         p_sys->i_remaining -= i_read;
     }
@@ -757,7 +831,7 @@ static int ReadICYMeta( access_t *p_access )
             strcmp( p_sys->psz_icy_title, &p[1] ) )
         {
             free( p_sys->psz_icy_title );
-            p_sys->psz_icy_title = strdup( &p[1] );
+            p_sys->psz_icy_title = EnsureUTF8( strdup( &p[1] ));
             p_access->info.i_update |= INPUT_UPDATE_META;
 
             msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title );
@@ -813,6 +887,17 @@ static int Seek( access_t *p_access, int64_t i_pos )
 
     Disconnect( p_access );
 
+    if( p_access->info.i_size
+     && (uint64_t)i_pos >= (uint64_t)p_access->info.i_size ) {
+        msg_Err( p_access, "seek to far" );
+        int retval = Seek( p_access, p_access->info.i_size - 1 );
+        if( retval == VLC_SUCCESS ) {
+            uint8_t p_buffer[2];
+            Read( p_access, p_buffer, 1);
+            p_access->info.b_eof  = false;
+        }
+        return retval;
+    }
     if( Connect( p_access, i_pos ) )
     {
         msg_Err( p_access, "seek failed" );
@@ -828,10 +913,9 @@ static int Seek( access_t *p_access, int64_t i_pos )
 static int Control( access_t *p_access, int i_query, va_list args )
 {
     access_sys_t *p_sys = p_access->p_sys;
-    bool   *pb_bool;
-    int          *pi_int;
-    int64_t      *pi_64;
-    vlc_meta_t   *p_meta;
+    bool       *pb_bool;
+    int64_t    *pi_64;
+    vlc_meta_t *p_meta;
 
     switch( i_query )
     {
@@ -856,11 +940,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = (int64_t)var_GetInteger( p_access, "http-caching" ) * 1000;
@@ -925,16 +1004,19 @@ static int Connect( access_t *p_access, int64_t i_tell )
     p_sys->b_chunked = false;
     p_sys->i_chunk = 0;
     p_sys->i_icy_meta = 0;
+    p_sys->i_icy_offset = i_tell;
     p_sys->psz_icy_name = NULL;
     p_sys->psz_icy_genre = NULL;
     p_sys->psz_icy_title = NULL;
+    p_sys->i_remaining = 0;
+    p_sys->b_persist = false;
 
-    p_access->info.i_size = 0;
+    p_access->info.i_size = -1;
     p_access->info.i_pos  = i_tell;
     p_access->info.b_eof  = false;
 
-
     /* Open connection */
+    assert( p_sys->fd == -1 ); /* No open sockets (leaking fds is BAD) */
     p_sys->fd = net_ConnectTCP( p_access, srv.psz_host, srv.i_port );
     if( p_sys->fd == -1 )
     {
@@ -997,7 +1079,7 @@ static int Connect( access_t *p_access, int64_t i_tell )
 
                 free( psz );
 
-                if( p_access->b_die || p_access->b_error )
+                if( !vlc_object_alive (p_access) || p_access->b_error )
                 {
                     Disconnect( p_access );
                     return -1;
@@ -1027,7 +1109,9 @@ static int Request( access_t *p_access, int64_t i_tell )
     access_sys_t   *p_sys = p_access->p_sys;
     char           *psz ;
     v_socket_t     *pvs = p_sys->p_vs;
+    p_sys->b_persist = false;
 
+    p_sys->i_remaining = 0;
     if( p_sys->b_proxy )
     {
         if( p_sys->url.psz_path )
@@ -1070,10 +1154,11 @@ static int Request( access_t *p_access, int64_t i_tell )
     net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "User-Agent: %s\r\n",
                 p_sys->psz_user_agent );
     /* Offset */
-    if( p_sys->i_version == 1 )
+    if( p_sys->i_version == 1 && ! p_sys->b_continuous )
     {
+        p_sys->b_persist = true;
         net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
-                    "Range: bytes=%"PRId64"-\r\n", i_tell );
+                    "Range: bytes=%"PRIu64"-\r\n", i_tell );
     }
 
     /* Cookies */
@@ -1114,17 +1199,6 @@ static int Request( access_t *p_access, int64_t i_tell )
     net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Icy-MetaData: 1\r\n" );
 
 
-    if( p_sys->b_continuous )
-    {
-        net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs,
-                    "Connection: Keep-Alive\r\n" );
-    }
-    else if( p_sys->i_version == 1 )
-    {
-        net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs,
-                    "Connection: Close\r\n");
-    }
-
     if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "\r\n" ) < 0 )
     {
         msg_Err( p_access, "failed to send request" );
@@ -1190,7 +1264,7 @@ static int Request( access_t *p_access, int64_t i_tell )
             goto error;
         }
 
-        if( p_access->b_die || p_access->b_error )
+        if( !vlc_object_alive (p_access) || p_access->b_error )
         {
             free( psz );
             goto error;
@@ -1214,16 +1288,33 @@ static int Request( access_t *p_access, int64_t i_tell )
 
         if( !strcasecmp( psz, "Content-Length" ) )
         {
-            if( p_sys->b_continuous )
-            {
-                p_access->info.i_size = -1;
-                msg_Dbg( p_access, "this frame size=%lld", atoll(p ) );
-                p_sys->i_remaining = atoll( p );
+            int64_t i_size = i_tell + (p_sys->i_remaining = atoll( p ));
+            if(i_size > p_access->info.i_size) {
+                p_access->info.i_size = i_size;
             }
-            else
-            {
-                p_access->info.i_size = i_tell + atoll( p );
-                msg_Dbg( p_access, "stream size=%"PRId64, p_access->info.i_size );
+            msg_Dbg( p_access, "this frame size=%"PRId64, p_sys->i_remaining );
+        }
+        else if( !strcasecmp( psz, "Content-Range" ) ) {
+            int64_t i_ntell = i_tell;
+            int64_t i_nend = (p_access->info.i_size > 0)?(p_access->info.i_size - 1):i_tell;
+            int64_t i_nsize = p_access->info.i_size;
+            sscanf(p,"bytes %"PRId64"-%"PRId64"/%"PRId64,&i_ntell,&i_nend,&i_nsize);
+            if(i_nend > i_ntell ) {
+                p_access->info.i_pos = i_ntell;
+                p_sys->i_remaining = i_nend+1-i_ntell;
+                int64_t i_size = (i_nsize > i_nend) ? i_nsize : (i_nend + 1);
+                if(i_size > p_access->info.i_size) {
+                    p_access->info.i_size = i_size;
+                }
+                msg_Dbg( p_access, "stream size=%"PRId64",pos=%"PRId64",remaining=%"PRId64,i_nsize,i_ntell,p_sys->i_remaining);
+            }
+        }
+        else if( !strcasecmp( psz, "Connection" ) ) {
+            msg_Dbg( p_access, "Connection: %s",p );
+            int i = -1;
+            sscanf(p, "close%n",&i);
+            if( i >= 0 ) {
+                p_sys->b_persist = false;
             }
         }
         else if( !strcasecmp( psz, "Location" ) )
@@ -1313,13 +1404,15 @@ static int Request( access_t *p_access, int64_t i_tell )
             p_sys->i_icy_meta = atoi( p );
             if( p_sys->i_icy_meta < 0 )
                 p_sys->i_icy_meta = 0;
+            if( p_sys->i_icy_meta > 0 )
+                p_sys->b_icecast = true;
 
             msg_Warn( p_access, "ICY metaint=%d", p_sys->i_icy_meta );
         }
         else if( !strcasecmp( psz, "Icy-Name" ) )
         {
             free( p_sys->psz_icy_name );
-            p_sys->psz_icy_name = strdup( p );
+            p_sys->psz_icy_name = EnsureUTF8( strdup( p ));
             msg_Dbg( p_access, "Icy-Name: %s", p_sys->psz_icy_name );
 
             p_sys->b_icecast = true; /* be on the safeside. set it here as well. */
@@ -1329,7 +1422,7 @@ static int Request( access_t *p_access, int64_t i_tell )
         else if( !strcasecmp( psz, "Icy-Genre" ) )
         {
             free( p_sys->psz_icy_genre );
-            p_sys->psz_icy_genre = strdup( p );
+            p_sys->psz_icy_genre = EnsureUTF8( strdup( p ));
             msg_Dbg( p_access, "Icy-Genre: %s", p_sys->psz_icy_genre );
         }
         else if( !strncasecmp( psz, "Icy-Notice", 10 ) )
@@ -1377,6 +1470,12 @@ static int Request( access_t *p_access, int64_t i_tell )
 
         free( psz );
     }
+    /* We close the stream for zero length data, unless of course the
+     * server has already promised to do this for us.
+     */
+    if( p_access->info.i_size != -1 && p_sys->i_remaining == 0 && p_sys->b_persist ) {
+        Disconnect( p_access );
+    }
     return VLC_SUCCESS;
 
 error:
@@ -1605,7 +1704,7 @@ static void AuthParseHeader( access_t *p_access, const char *psz_header,
         const char *psz_end = strchr( psz_header, ' ' );
         if( psz_end )
             msg_Warn( p_access, "Unknown authentication scheme: '%*s'",
-                      psz_end - psz_header, psz_header );
+                      (int)(psz_end - psz_header), psz_header );
         else
             msg_Warn( p_access, "Unknown authentication scheme: '%s'",
                       psz_header );