#include <assert.h>
-#ifdef HAVE_PROXY_H
-# include "proxy.h"
+#ifdef HAVE_LIBPROXY
+# include <proxy.h>
#endif
/*****************************************************************************
* Module descriptor
#define FORWARD_COOKIES_TEXT N_("Forward Cookies")
#define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies across http redirections ")
-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 );
+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 );
RECONNECT_LONGTEXT, true );
add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT,
CONTINUOUS_LONGTEXT, true );
- add_bool( "http-forward-cookies", 0, NULL, FORWARD_COOKIES_TEXT,
+ 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();
+ 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
vlc_UrlParse( &p_sys->proxy, psz, 0 );
free( psz );
}
-#ifdef HAVE_PROXY_H
+#ifdef HAVE_LIBPROXY
else
{
pxProxyFactory *pf = px_proxy_factory_new();
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,
if( psz_password ) p_sys->url.psz_password = strdup( psz_password );
free( psz_login );
free( psz_password );
+ Disconnect( p_access );
goto connect;
}
else
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;
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 )
{
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 );
}