FTP cleartext authentication from Petr Vacek.

[vlc] / modules / access / http.c

diff --git a/modules/access/http.c b/modules/access/http.c
index 8eed919201588b601085bd9e615ace3f401b2b6b..e365a717a76f10a45eee15501d03232ed3c28fe2 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -290,8 +290,9 @@ connect:
         char *psz_login = NULL; char *psz_password = NULL;
         int i_ret;
         msg_Dbg( p_access, "authentication failed" );
-        i_ret = intf_UserLoginPassword( p_access, "HTTP authentication",
-                         "Please enter a valid login and password.", &psz_login, &psz_password );
+        i_ret = intf_UserLoginPassword( p_access, _("HTTP authentication"),
+                        _("Please enter a valid login name and a password."), 
+                                                &psz_login, &psz_password );
         if( i_ret == DIALOG_OK_YES )
         {
             msg_Dbg( p_access, "retrying with user=%s, pwd=%s",
@@ -336,9 +337,9 @@ connect:
             goto error;
         }
 
-        /* Change the uri */
+        /* Change the URI */
         vlc_mutex_lock( &p_playlist->object_lock );
-        p_input_item = &p_playlist->status.p_item->input;
+        p_input_item = p_playlist->status.p_item->p_input;
         vlc_mutex_lock( &p_input_item->lock );
         free( p_input_item->psz_uri );
         free( p_access->psz_path );
@@ -406,7 +407,8 @@ connect:
         p_access->psz_demux = strdup( "nsv" );
     }
     else if( p_sys->psz_mime &&
-             !strcasecmp( p_sys->psz_mime, "application/xspf+xml" ) )
+             !strncasecmp( p_sys->psz_mime, "application/xspf+xml", 20 ) &&
+             ( memchr( " ;\t", p_sys->psz_mime[20], 4 ) != NULL ) )
         p_access->psz_demux = strdup( "xspf-open" );
 
     if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" );
@@ -639,7 +641,8 @@ static int ReadICYMeta( access_t *p_access )
         p += strlen( "StreamTitle=" );
         if( *p == '\'' || *p == '"' )
         {
-            char *psz = strchr( &p[1], p[0] );
+            char closing[] = { p[0], ';', '\0' };
+            char *psz = strstr( &p[1], closing );
             if( !psz )
                 psz = strchr( &p[1], ';' );
 
@@ -694,7 +697,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
     vlc_bool_t   *pb_bool;
     int          *pi_int;
     int64_t      *pi_64;
-    vlc_meta_t **pp_meta;
+    vlc_meta_t   *p_meta;
 
     switch( i_query )
     {
@@ -734,18 +737,14 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         case ACCESS_GET_META:
-            pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
-            *pp_meta = vlc_meta_New();
+            p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
 
             if( p_sys->psz_icy_name )
-                vlc_meta_Add( *pp_meta, VLC_META_TITLE,
-                              p_sys->psz_icy_name );
+                vlc_meta_SetTitle( p_meta, p_sys->psz_icy_name );
             if( p_sys->psz_icy_genre )
-                vlc_meta_Add( *pp_meta, VLC_META_GENRE,
-                              p_sys->psz_icy_genre );
+                vlc_meta_SetGenre( p_meta, p_sys->psz_icy_genre );
             if( p_sys->psz_icy_title )
-                vlc_meta_Add( *pp_meta, VLC_META_NOW_PLAYING,
-                              p_sys->psz_icy_title );
+                vlc_meta_SetNowPlaying( p_meta, p_sys->psz_icy_title );
             break;
 
         case ACCESS_GET_TITLE_INFO: