"Caching value for HTTP streams. This " \
"value should be set in milliseconds." )
-#define AGENT_TEXT N_("HTTP user agent")
-#define AGENT_LONGTEXT N_("User agent that will be " \
- "used for the connection.")
-
#define RECONNECT_TEXT N_("Auto re-connect")
#define RECONNECT_LONGTEXT N_( \
"Automatically try to reconnect to the stream in case of a sudden " \
add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, true )
change_safe()
- add_string( "http-user-agent", PACKAGE_NAME" "PACKAGE_VERSION, NULL,
- AGENT_TEXT, AGENT_LONGTEXT, true )
+ add_string( "http-user-agent", NULL, NULL, NULL, NULL, false )
change_safe()
+ change_private()
add_bool( "http-reconnect", false, NULL, RECONNECT_TEXT,
RECONNECT_LONGTEXT, true )
add_bool( "http-continuous", false, NULL, CONTINUOUS_TEXT,
#endif
add_obsolete_string("http-user")
add_obsolete_string("http-pwd")
- add_shortcut( "http" )
- add_shortcut( "https" )
- add_shortcut( "unsv" )
- add_shortcut( "itpc" ) /* iTunes Podcast */
- add_shortcut( "icyx" )
+ /* 'itpc' = iTunes Podcast */
+ add_shortcut( "http", "https", "unsv", "itpc", "icyx" )
set_callbacks( Open, Close )
vlc_module_end ()
{
access_t *p_access = (access_t*)p_this;
return OpenWithCookies( p_this, p_access->psz_access, 0,
- var_CreateGetInteger( p_access, "http-max-redirect" ), NULL );
+ var_InheritInteger( p_access, "http-max-redirect" ), NULL );
}
/**
char *psz, *p;
/* Only forward an store cookies if the corresponding option is activated */
- bool b_forward_cookies = var_CreateGetBool( p_access, "http-forward-cookies" );
+ bool b_forward_cookies = var_InheritBool( p_access, "http-forward-cookies" );
vlc_array_t * saved_cookies = b_forward_cookies ? (cookies ? cookies : vlc_array_new()) : NULL;
/* Set up p_access */
p_sys->url.i_port = 80;
}
- /* Do user agent */
- p_sys->psz_user_agent = var_CreateGetString( p_access, "http-user-agent" );
+ /* Determine the HTTP user agent */
+ /* See RFC2616 §2.2 token definition and §3.8 user-agent header */
+ p_sys->psz_user_agent = var_InheritString( p_access, "http-user-agent" );
+ for( char *p = p_sys->psz_user_agent; *p; p++ )
+ {
+ uint8_t c = *p;
+ if( c < 32 || strchr( "()<>@,;:\\\"[]?={}", c ) )
+ *p = '_'; /* remove potentially harmful characters */
+ }
/* Check proxy */
- psz = var_CreateGetNonEmptyString( p_access, "http-proxy" );
+ psz = var_InheritString( p_access, "http-proxy" );
if( psz )
{
p_sys->b_proxy = true;
#elif defined( WIN32 )
else
{
- if( var_CreateGetBool( p_access, "http-use-IE-proxy" ) )
+ if( var_InheritBool( p_access, "http-use-IE-proxy" ) )
{
/* Try to get the proxy server address from Windows internet settings using registry. */
HKEY h_key;
{
/* Get the proxy URL :
Proxy server value in the registry can be something like "address:port"
- or "ftp=adress1:port1;http=adress2:port2 ..." depending of the
+ or "ftp=address1:port1;http=address2:port2 ..." depending of the
confirguration. */
char *psz_proxy;
psz_proxy = strstr( psz_key, "http=" );
if( psz ) /* No, this is NOT a use-after-free error */
{
- psz = var_CreateGetNonEmptyString( p_access, "http-proxy-pwd" );
+ psz = var_InheritString( p_access, "http-proxy-pwd" );
if( psz )
p_sys->proxy.psz_password = p_sys->psz_proxy_passbuf = psz;
}
msg_Dbg( p_access, " user='%s'", p_sys->url.psz_username );
}
- p_sys->b_reconnect = var_CreateGetBool( p_access, "http-reconnect" );
- p_sys->b_continuous = var_CreateGetBool( p_access, "http-continuous" );
+ p_sys->b_reconnect = var_InheritBool( p_access, "http-reconnect" );
+ p_sys->b_continuous = var_InheritBool( p_access, "http-continuous" );
connect:
/* Connect */
/* */
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;
+ *pi_64 = var_GetInteger( p_access, "http-caching" ) * 1000;
break;
/* */
}
}
/* User Agent */
- net_Printf( p_access, p_sys->fd, pvs, "User-Agent: %s\r\n",
+ net_Printf( p_access, p_sys->fd, pvs,
+ "User-Agent: %s\r\n",
p_sys->psz_user_agent );
/* Offset */
if( p_sys->i_version == 1 && ! p_sys->b_continuous )