Test commit. This commit breaks the build, don't use it

[vlc] / modules / access / http.c

diff --git a/modules/access/http.c b/modules/access/http.c
index e2375ab772720cfa8db6b241857c3e9361f740b5..a5424c342f1ac2e8cbcd33b5baad5bdf980114a0 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * http.c: HTTP input module
  *****************************************************************************
- * Copyright (C) 2001-2005 VideoLAN
+ * Copyright (C) 2001-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -39,7 +39,7 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-static int  Open ( vlc_object_t * );
+satic int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 #define PROXY_TEXT N_("HTTP proxy")
@@ -82,10 +82,9 @@ vlc_module_begin();
               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 );
@@ -153,33 +152,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;
@@ -214,21 +187,12 @@ static int Open( vlc_object_t *p_this )
     p_sys->psz_icy_title = NULL;
     p_sys->i_remaining = 0;
 
-    /* Parse URI */
-    if( vlc_UrlIsNotEncoded( p_access->psz_path ) )
-    {
-        psz = vlc_UrlEncode( p_access->psz_path );
-        if( psz == NULL )
-        {
-            free( p_sys );
-            return VLC_ENOMEM;
-        }
-
-        vlc_UrlParse( &p_sys->url, psz, 0 );
-        free( psz );
-    }
-    else
-        vlc_UrlParse( &p_sys->url, p_access->psz_path, 0 );
+    /* 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' )
     {
@@ -322,6 +286,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 )
@@ -598,37 +571,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);
-
-    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 );
+    i_read = buffer << 4;
+    msg_Dbg( p_access, "ICY meta size=%u", i_read);
 
-    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] = '\0'; /* Just in case */
+    psz_meta[i_read] = '\0'; /* Just in case */
 
     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=" );
@@ -880,7 +849,6 @@ static int Request( access_t *p_access, int64_t i_tell )
 
     if( p_sys->b_proxy )
     {
-        /* FIXME: support SSL proxies */
         if( p_sys->url.psz_path )
         {
             net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,