X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fhttp.c;h=71bdcb011a4807c403bf8f85d09d8ec1b7bff897;hb=4db8257a88e991b8d84d1bdce3119eaa3558b544;hp=e0900c2d15865bb091675337e586f3734c2770bf;hpb=2d5322c3127e8692c74391f8f6d764a9e662773e;p=vlc diff --git a/modules/access/http.c b/modules/access/http.c index e0900c2d15..71bdcb011a 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -1,11 +1,12 @@ /***************************************************************************** * http.c: HTTP input module ***************************************************************************** - * Copyright (C) 2001-2004 VideoLAN + * Copyright (C) 2001-2005 the VideoLAN team * $Id$ * * Authors: Laurent Aimar * Christophe Massiot + * Rémi Denis-Courmont * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -30,9 +31,11 @@ #include #include +#include "vlc_interaction.h" #include "vlc_playlist.h" #include "vlc_meta.h" #include "network.h" +#include "vlc_url.h" #include "vlc_tls.h" /***************************************************************************** @@ -43,39 +46,35 @@ static void Close( vlc_object_t * ); #define PROXY_TEXT N_("HTTP proxy") #define PROXY_LONGTEXT N_( \ - "You can specify an HTTP proxy to use. It must be of the form " \ - "http://myproxy.mydomain:myport/. If none is specified, the HTTP_PROXY " \ - "environment variable will be tried." ) + "HTTP proxy to be usesd It must be of the form " \ + "http://[user[:pass]@]myproxy.mydomain:myport/ ; " \ + "if empty, the http_proxy environment variable will be tried." ) #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for http streams. This " \ - "value should be set in millisecond units." ) - -#define USER_TEXT N_("HTTP user name") -#define USER_LONGTEXT N_("Allows you to modify the user name that will " \ - "be used for the connection (Basic authentication only).") - -#define PASS_TEXT N_("HTTP password") -#define PASS_LONGTEXT N_("Allows you to modify the password that will be " \ - "used for the connection.") + "Caching value for HTTP streams. This " \ + "value should be set in milliseconds." ) #define AGENT_TEXT N_("HTTP user agent") -#define AGENT_LONGTEXT N_("Allows you to modify the user agent that will be " \ +#define AGENT_LONGTEXT N_("User agent that will be " \ "used for the connection.") #define RECONNECT_TEXT N_("Auto re-connect") -#define RECONNECT_LONGTEXT N_("Will automatically attempt a re-connection " \ - "in case it was untimely closed.") +#define RECONNECT_LONGTEXT N_( \ + "Automatically try to reconnect to the stream in case of a sudden " \ + "disconnect." ) +/// \bug missing space before you should #define CONTINUOUS_TEXT N_("Continuous stream") -#define CONTINUOUS_LONGTEXT N_("Enable this option to read a file that is " \ - "being constantly updated (for example, a JPG file on a server)") +#define CONTINUOUS_LONGTEXT N_("Read a file that is " \ + "being constantly updated (for example, a JPG file on a server)." \ + "You should not globally enable this option as it will break all other " \ + "types of HTTP streams." ) vlc_module_begin(); set_description( _("HTTP input") ); set_capability( "access2", 0 ); - set_shortname( _( "HTTP/HTTPS" ) ); + set_shortname( _( "HTTP(S)" ) ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS ); @@ -83,18 +82,15 @@ vlc_module_begin(); VLC_FALSE ); add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); - add_string( "http-user", NULL, NULL, USER_TEXT, USER_LONGTEXT, VLC_FALSE ); - add_string( "http-pwd", NULL , NULL, PASS_TEXT, PASS_LONGTEXT, VLC_FALSE ); add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT, - AGENT_LONGTEXT, VLC_FALSE ); + AGENT_LONGTEXT, VLC_TRUE ); add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT, RECONNECT_LONGTEXT, VLC_TRUE ); add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT, CONTINUOUS_LONGTEXT, VLC_TRUE ); - + add_suppressed_string("http-user"); + add_suppressed_string("http-pwd"); add_shortcut( "http" ); - add_shortcut( "http4" ); - add_shortcut( "http6" ); add_shortcut( "https" ); add_shortcut( "unsv" ); set_callbacks( Open, Close ); @@ -111,8 +107,6 @@ struct access_sys_t /* From uri */ vlc_url_t url; - char *psz_user; - char *psz_passwd; char *psz_user_agent; /* Proxy */ @@ -153,8 +147,7 @@ static int Seek( access_t *, int64_t ); static int Control( access_t *, int, va_list ); /* */ -static void ParseURL( access_sys_t *, char *psz_url ); -static int Connect( access_t *, int64_t ); +static int Connect( access_t *, int64_t ); static int Request( access_t *p_access, int64_t i_tell ); static void Disconnect( access_t * ); @@ -165,33 +158,7 @@ static int Open( vlc_object_t *p_this ) { access_t *p_access = (access_t*)p_this; access_sys_t *p_sys; - char *psz; - - /* First set ipv4/ipv6 */ - var_Create( p_access, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_access, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - - if( *p_access->psz_access ) - { - vlc_value_t val; - /* Find out which shortcut was used */ - if( !strncmp( p_access->psz_access, "http4", 6 ) ) - { - val.b_bool = VLC_TRUE; - var_Set( p_access, "ipv4", val ); - - val.b_bool = VLC_FALSE; - var_Set( p_access, "ipv6", val ); - } - else if( !strncmp( p_access->psz_access, "http6", 6 ) ) - { - val.b_bool = VLC_TRUE; - var_Set( p_access, "ipv6", val ); - - val.b_bool = VLC_FALSE; - var_Set( p_access, "ipv4", val ); - } - } + char *psz, *p; /* Set up p_access */ p_access->pf_read = Read; @@ -226,8 +193,14 @@ static int Open( vlc_object_t *p_this ) p_sys->psz_icy_title = NULL; p_sys->i_remaining = 0; - /* Parse URI */ - ParseURL( p_sys, p_access->psz_path ); + + /* Parse URI - remove spaces */ + p = psz = strdup( p_access->psz_path ); + while( (p = strchr( p, ' ' )) != NULL ) + *p = '+'; + vlc_UrlParse( &p_sys->url, psz, 0 ); + free( psz ); + if( p_sys->url.psz_host == NULL || *p_sys->url.psz_host == '\0' ) { msg_Warn( p_access, "invalid host" ); @@ -235,7 +208,7 @@ static int Open( vlc_object_t *p_this ) } if( !strncmp( p_access->psz_access, "https", 5 ) ) { - /* SSL over HTTP */ + /* HTTP over SSL */ p_sys->b_ssl = VLC_TRUE; if( p_sys->url.i_port <= 0 ) p_sys->url.i_port = 443; @@ -245,11 +218,6 @@ static int Open( vlc_object_t *p_this ) if( p_sys->url.i_port <= 0 ) p_sys->url.i_port = 80; } - if( !p_sys->psz_user || *p_sys->psz_user == '\0' ) - { - p_sys->psz_user = var_CreateGetString( p_access, "http-user" ); - p_sys->psz_passwd = var_CreateGetString( p_access, "http-pwd" ); - } /* Do user agent */ p_sys->psz_user_agent = var_CreateGetString( p_access, "http-user-agent" ); @@ -261,6 +229,7 @@ static int Open( vlc_object_t *p_this ) p_sys->b_proxy = VLC_TRUE; vlc_UrlParse( &p_sys->proxy, psz, 0 ); } +#ifdef HAVE_GETENV else { char *psz_proxy = getenv( "http_proxy" ); @@ -269,9 +238,8 @@ static int Open( vlc_object_t *p_this ) p_sys->b_proxy = VLC_TRUE; vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 ); } - if( psz_proxy ) - free( psz_proxy ); } +#endif free( psz ); if( p_sys->b_proxy ) @@ -294,15 +262,16 @@ static int Open( vlc_object_t *p_this ) msg_Dbg( p_access, " proxy %s:%d", p_sys->proxy.psz_host, p_sys->proxy.i_port ); } - if( p_sys->psz_user && *p_sys->psz_user ) + if( p_sys->url.psz_username && *p_sys->url.psz_username ) { msg_Dbg( p_access, " user='%s', pwd='%s'", - p_sys->psz_user, p_sys->psz_passwd ); + p_sys->url.psz_username, p_sys->url.psz_password ); } p_sys->b_reconnect = var_CreateGetBool( p_access, "http-reconnect" ); p_sys->b_continuous = var_CreateGetBool( p_access, "http-continuous" ); +connect: /* Connect */ if( Connect( p_access, 0 ) ) { @@ -316,6 +285,32 @@ static int Open( vlc_object_t *p_this ) } } + if( p_sys->i_code == 401 ) + { + 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 name and a password."), + &psz_login, &psz_password ); + if( i_ret == DIALOG_OK_YES ) + { + msg_Dbg( p_access, "retrying with user=%s, pwd=%s", + psz_login, psz_password ); + if( psz_login ) p_sys->url.psz_username = strdup( psz_login ); + if( psz_password ) p_sys->url.psz_password = strdup( psz_password ); + if( psz_login ) free( psz_login ); + if( psz_password ) free( psz_password ); + goto connect; + } + else + { + if( psz_login ) free( psz_login ); + if( psz_password ) free( psz_password ); + goto error; + } + } + if( ( p_sys->i_code == 301 || p_sys->i_code == 302 || p_sys->i_code == 303 || p_sys->i_code == 307 ) && p_sys->psz_location && *p_sys->psz_location ) @@ -325,6 +320,15 @@ static int Open( vlc_object_t *p_this ) msg_Dbg( p_access, "redirection to %s", p_sys->psz_location ); + /* Do not accept redirection outside of HTTP works */ + if( strncmp( p_sys->psz_location, "http", 4 ) + || ( ( p_sys->psz_location[4] != ':' ) /* HTTP */ + && strncmp( p_sys->psz_location + 4, "s:", 2 ) /* HTTP/SSL */ ) ) + { + msg_Err( p_access, "insecure redirection ignored" ); + goto error; + } + p_playlist = vlc_object_find( p_access, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); if( !p_playlist ) @@ -352,8 +356,6 @@ static int Open( vlc_object_t *p_this ) if( p_sys->psz_pragma ) free( p_sys->psz_pragma ); if( p_sys->psz_location ) free( p_sys->psz_location ); if( p_sys->psz_user_agent ) free( p_sys->psz_user_agent ); - if( p_sys->psz_user ) free( p_sys->psz_user ); - if( p_sys->psz_passwd ) free( p_sys->psz_passwd ); Disconnect( p_access ); free( p_sys ); @@ -364,16 +366,16 @@ static int Open( vlc_object_t *p_this ) if( p_sys->b_mms ) { - msg_Dbg( p_access, "This is actually a live mms server, BAIL" ); + msg_Dbg( p_access, "this is actually a live mms server, BAIL" ); goto error; } if( !strcmp( p_sys->psz_protocol, "ICY" ) || p_sys->b_icecast ) { if( p_sys->psz_mime && strcasecmp( p_sys->psz_mime, "application/ogg" ) ) - { + { if( !strcasecmp( p_sys->psz_mime, "video/nsv" ) || - !strcasecmp( p_sys->psz_mime, "video/nsa") ) + !strcasecmp( p_sys->psz_mime, "video/nsa" ) ) p_access->psz_demux = strdup( "nsv" ); else if( !strcasecmp( p_sys->psz_mime, "audio/aac" ) || !strcasecmp( p_sys->psz_mime, "audio/aacp" ) ) @@ -384,8 +386,9 @@ static int Open( vlc_object_t *p_this ) msg_Info( p_access, "Raw-audio server found, %s demuxer selected", p_access->psz_demux ); -#if 0 /* Doesn't work really well because of the pre-buffering in shoutcast - * servers (the buffer content will be sent as fast as possible). */ +#if 0 /* Doesn't work really well because of the pre-buffering in + * shoutcast servers (the buffer content will be sent as fast as + * possible). */ p_sys->b_pace_control = VLC_FALSE; #endif } @@ -396,6 +399,16 @@ static int Open( vlc_object_t *p_this ) } /* else probably Ogg Vorbis */ } + else if( !strcasecmp( p_access->psz_access, "unsv" ) && + p_sys->psz_mime && + !strcasecmp( p_sys->psz_mime, "misc/ultravox" ) ) + { + /* Grrrr! detect ultravox server and force NSV demuxer */ + p_access->psz_demux = strdup( "nsv" ); + } + else if( p_sys->psz_mime && + !strcasecmp( p_sys->psz_mime, "application/xspf+xml" ) ) + p_access->psz_demux = strdup( "xspf-open" ); if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" ); @@ -411,8 +424,6 @@ error: if( p_sys->psz_pragma ) free( p_sys->psz_pragma ); if( p_sys->psz_location ) free( p_sys->psz_location ); if( p_sys->psz_user_agent ) free( p_sys->psz_user_agent ); - if( p_sys->psz_user ) free( p_sys->psz_user ); - if( p_sys->psz_passwd ) free( p_sys->psz_passwd ); Disconnect( p_access ); free( p_sys ); @@ -430,9 +441,6 @@ static void Close( vlc_object_t *p_this ) vlc_UrlClean( &p_sys->url ); vlc_UrlClean( &p_sys->proxy ); - if( p_sys->psz_user ) free( p_sys->psz_user ); - if( p_sys->psz_passwd ) free( p_sys->psz_passwd ); - if( p_sys->psz_mime ) free( p_sys->psz_mime ); if( p_sys->psz_pragma ) free( p_sys->psz_pragma ); if( p_sys->psz_location ) free( p_sys->psz_location ); @@ -600,37 +608,33 @@ static int ReadICYMeta( access_t *p_access ) { access_sys_t *p_sys = p_access->p_sys; - uint8_t buffer[1]; - char *psz_meta; + uint8_t buffer; + char *p, *psz_meta; int i_read; - char *p; /* Read meta data length */ - i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, buffer, 1, + i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, &buffer, 1, VLC_TRUE ); if( i_read <= 0 ) return VLC_EGENERIC; - - - if( buffer[0] <= 0 ) + if( buffer == 0 ) return VLC_SUCCESS; - msg_Dbg( p_access, "ICY meta size=%d", buffer[0] * 16); + i_read = buffer << 4; + /* msg_Dbg( p_access, "ICY meta size=%u", i_read); */ - psz_meta = malloc( buffer[0] * 16 + 1 ); - i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, - psz_meta, buffer[0] * 16, VLC_TRUE ); - - if( i_read != buffer[0] * 16 ) + psz_meta = malloc( i_read + 1 ); + if( net_Read( p_access, p_sys->fd, p_sys->p_vs, + (uint8_t *)psz_meta, i_read, VLC_TRUE ) != i_read ) return VLC_EGENERIC; - psz_meta[buffer[0]*16 + 1] = '\0'; /* Just in case */ + psz_meta[i_read] = '\0'; /* Just in case */ - msg_Dbg( p_access, "icy-meta=%s", psz_meta ); + /* msg_Dbg( p_access, "icy-meta=%s", psz_meta ); */ /* Now parse the meta */ /* Look for StreamTitle= */ - p = strcasestr( psz_meta, "StreamTitle=" ); + p = strcasestr( (char *)psz_meta, "StreamTitle=" ); if( p ) { p += strlen( "StreamTitle=" ); @@ -648,17 +652,19 @@ static int ReadICYMeta( access_t *p_access ) if( psz ) *psz = '\0'; } - if( p_sys->psz_icy_title ) free( p_sys->psz_icy_title ); - - p_sys->psz_icy_title = strdup( &p[1] ); + if( !p_sys->psz_icy_title || + strcmp( p_sys->psz_icy_title, &p[1] ) ) + { + if( p_sys->psz_icy_title ) + free( p_sys->psz_icy_title ); + p_sys->psz_icy_title = strdup( &p[1] ); + p_access->info.i_update |= INPUT_UPDATE_META; - p_access->info.i_update |= INPUT_UPDATE_META; + msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title ); + } } - free( psz_meta ); - msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title ); - return VLC_SUCCESS; } @@ -705,7 +711,12 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_CAN_PAUSE: case ACCESS_CAN_CONTROL_PACE: pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + +#if 0 /* Disable for now until we have a clock synchro algo + * which works with something else than MPEG over UDP */ *pb_bool = p_sys->b_pace_control; +#endif + *pb_bool = VLC_TRUE; break; /* */ @@ -726,16 +737,15 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_GET_META: pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** ); *pp_meta = vlc_meta_New(); - msg_Dbg( p_access, "GET META %s %s %s", - p_sys->psz_icy_name, p_sys->psz_icy_genre, p_sys->psz_icy_title ); + if( p_sys->psz_icy_name ) - vlc_meta_Add( *pp_meta, VLC_META_DESCRIPTION, + vlc_meta_Add( *pp_meta, VLC_META_TITLE, p_sys->psz_icy_name ); if( p_sys->psz_icy_genre ) vlc_meta_Add( *pp_meta, VLC_META_GENRE, p_sys->psz_icy_genre ); if( p_sys->psz_icy_title ) - vlc_meta_Add( *pp_meta, VLC_META_TITLE, + vlc_meta_Add( *pp_meta, VLC_META_NOW_PLAYING, p_sys->psz_icy_title ); break; @@ -753,54 +763,6 @@ static int Control( access_t *p_access, int i_query, va_list args ) return VLC_SUCCESS; } -/***************************************************************************** - * ParseURL: extract user:password - *****************************************************************************/ -static void ParseURL( access_sys_t *p_sys, char *psz_url ) -{ - char *psz_dup = strdup( psz_url ); - char *p = psz_dup; - char *psz; - - /* Syntax //[user:password]@[:][/] */ - while( *p == '/' ) - { - p++; - } - psz = p; - - /* Parse auth */ - if( ( p = strchr( psz, '@' ) ) ) - { - char *comma; - - *p++ = '\0'; - comma = strchr( psz, ':' ); - - /* Retreive user:password */ - if( comma ) - { - *comma++ = '\0'; - - p_sys->psz_user = strdup( psz ); - p_sys->psz_passwd = strdup( comma ); - } - else - { - p_sys->psz_user = strdup( psz ); - } - } - else - { - p = psz; - } - - /* Parse uri */ - vlc_UrlParse( &p_sys->url, p, 0 ); - - free( psz_dup ); -} - /***************************************************************************** * Connect: *****************************************************************************/ @@ -836,7 +798,7 @@ static int Connect( access_t *p_access, int64_t i_tell ) /* Open connection */ - p_sys->fd = net_OpenTCP( p_access, srv.psz_host, srv.i_port ); + p_sys->fd = net_ConnectTCP( p_access, srv.psz_host, srv.i_port ); if( p_sys->fd < 0 ) { msg_Err( p_access, "cannot connect to %s:%d", srv.psz_host, srv.i_port ); @@ -844,27 +806,76 @@ static int Connect( access_t *p_access, int64_t i_tell ) } /* Initialize TLS/SSL session */ - /* FIXME: support proxy CONNECT for HTTP/SSL */ if( p_sys->b_ssl == VLC_TRUE ) { + /* CONNECT to establish TLS tunnel through HTTP proxy */ if( p_sys->b_proxy ) { - msg_Err( p_access, "HTTP/SSL through HTTP proxy not supported yet" ); - Disconnect( p_access ); - return VLC_EGENERIC; + char *psz; + unsigned i_status = 0; + + if( p_sys->i_version == 0 ) + { + /* CONNECT is not in HTTP/1.0 */ + Disconnect( p_access ); + return VLC_EGENERIC; + } + + net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, + "CONNECT %s:%d HTTP/1.%d\r\nHost: %s:%d\r\n\r\n", + p_sys->url.psz_host, p_sys->url.i_port, + p_sys->i_version, + p_sys->url.psz_host, p_sys->url.i_port); + + psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL ); + if( psz == NULL ) + { + msg_Err( p_access, "cannot establish HTTP/TLS tunnel" ); + Disconnect( p_access ); + return VLC_EGENERIC; + } + + sscanf( psz, "HTTP/%*u.%*u %3u", &i_status ); + free( psz ); + + if( ( i_status / 100 ) != 2 ) + { + msg_Err( p_access, "HTTP/TLS tunnel through proxy denied" ); + Disconnect( p_access ); + return VLC_EGENERIC; + } + + do + { + psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL ); + if( psz == NULL ) + { + msg_Err( p_access, "HTTP proxy connection failed" ); + Disconnect( p_access ); + return VLC_EGENERIC; + } + + if( *psz == '\0' ) + i_status = 0; + + free( psz ); + } + while( i_status ); } - p_sys->p_tls = tls_ClientCreate( VLC_OBJECT(p_access), NULL, p_sys->fd ); + /* TLS/SSL handshake */ + p_sys->p_tls = tls_ClientCreate( VLC_OBJECT(p_access), p_sys->fd, + srv.psz_host ); if( p_sys->p_tls == NULL ) { - msg_Err( p_access, "cannot establish HTTP/SSL session" ); + msg_Err( p_access, "cannot establish HTTP/TLS session" ); Disconnect( p_access ); return VLC_EGENERIC; } p_sys->p_vs = &p_sys->p_tls->sock; } - return Request( p_access,i_tell ); + return Request( p_access, i_tell ); } @@ -922,22 +933,40 @@ static int Request( access_t *p_access, int64_t i_tell ) "Range: bytes="I64Fd"-\r\n", i_tell ); } - /* Authentification */ - if( p_sys->psz_user && *p_sys->psz_user ) + /* Authentication */ + if( p_sys->url.psz_username && *p_sys->url.psz_username ) { char *buf; char *b64; - asprintf( &buf, "%s:%s", p_sys->psz_user, - p_sys->psz_passwd ? p_sys->psz_passwd : "" ); + asprintf( &buf, "%s:%s", p_sys->url.psz_username, + p_sys->url.psz_password ? p_sys->url.psz_password : "" ); b64 = vlc_b64_encode( buf ); + free( buf ); net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Authorization: Basic %s\r\n", b64 ); free( b64 ); } + /* Proxy Authentication */ + if( p_sys->proxy.psz_username && *p_sys->proxy.psz_username ) + { + char *buf; + char *b64; + + asprintf( &buf, "%s:%s", p_sys->proxy.psz_username, + p_sys->proxy.psz_password ? p_sys->proxy.psz_password : "" ); + + b64 = vlc_b64_encode( buf ); + free( buf ); + + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + "Proxy-Authorization: Basic %s\r\n", b64 ); + free( b64 ); + } + /* ICY meta data request */ net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Icy-MetaData: 1\r\n" ); @@ -994,7 +1023,13 @@ static int Request( access_t *p_access, int64_t i_tell ) { p_sys->b_seekable = VLC_FALSE; } - if( p_sys->i_code >= 400 ) + /* Authentication error - We'll have to display the dialog */ + if( p_sys->i_code == 401 ) + { + + } + /* Other fatal error */ + else if( p_sys->i_code >= 400 ) { msg_Err( p_access, "error: %s", psz ); free( psz );