Remove _GNU_SOURCE and string.h too

[vlc] / modules / access / http.c

diff --git a/modules/access/http.c b/modules/access/http.c
index a42669589bdbdc321c693296a6aca06591b13c66..33c15e8abedf0044282cb81573748a701d6fedef 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -26,11 +26,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#define _GNU_SOURCE
 #include <vlc/vlc.h>
 
-#include <string.h>
-#include <stdlib.h>
 
 #include <vlc_access.h>
 
@@ -50,7 +47,7 @@ static void Close( vlc_object_t * );
 
 #define PROXY_TEXT N_("HTTP proxy")
 #define PROXY_LONGTEXT N_( \
-    "HTTP proxy to be usesd It must be of the form " \
+    "HTTP proxy to be used It must be of the form " \
     "http://[user[:pass]@]myproxy.mydomain:myport/ ; " \
     "if empty, the http_proxy environment variable will be tried." )
 
@@ -68,10 +65,9 @@ static void Close( vlc_object_t * );
     "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_("Read a file that is " \
-    "being constantly updated (for example, a JPG file on a server)." \
+    "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." )
 
@@ -92,8 +88,8 @@ 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_obsolete_string("http-user");
+    add_obsolete_string("http-pwd");
     add_shortcut( "http" );
     add_shortcut( "https" );
     add_shortcut( "unsv" );
@@ -741,11 +737,11 @@ static int Control( access_t *p_access, int i_query, va_list args )
             p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
 
             if( p_sys->psz_icy_name )
-                vlc_meta_SetTitle( p_meta, p_sys->psz_icy_name );
+                vlc_meta_Set( p_meta, vlc_meta_Title, p_sys->psz_icy_name );
             if( p_sys->psz_icy_genre )
-                vlc_meta_SetGenre( p_meta, p_sys->psz_icy_genre );
+                vlc_meta_Set( p_meta, vlc_meta_Genre, p_sys->psz_icy_genre );
             if( p_sys->psz_icy_title )
-                vlc_meta_SetNowPlaying( p_meta, p_sys->psz_icy_title );
+                vlc_meta_Set( p_meta, vlc_meta_NowPlaying, p_sys->psz_icy_title );
             break;
 
         case ACCESS_GET_TITLE_INFO:
@@ -933,37 +929,41 @@ static int Request( access_t *p_access, int64_t i_tell )
     }
 
     /* Authentication */
-    if( p_sys->url.psz_username && *p_sys->url.psz_username )
+    if( p_sys->url.psz_username || p_sys->url.psz_password )
     {
-        char *buf;
+        char buf[strlen( p_sys->url.psz_username ?: "" )
+                  + strlen( p_sys->url.psz_password ?: "" ) + 2];
         char *b64;
 
-        asprintf( &buf, "%s:%s", p_sys->url.psz_username,
-                   p_sys->url.psz_password ? p_sys->url.psz_password : "" );
-
+        snprintf( buf, sizeof( buf ), "%s:%s", p_sys->url.psz_username ?: "",
+                  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 );
+        if( b64 != NULL )
+        {
+             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 )
+    if( p_sys->proxy.psz_username || p_sys->proxy.psz_password )
     {
-        char *buf;
+        char buf[strlen( p_sys->proxy.psz_username ?: "" )
+                  + strlen( p_sys->proxy.psz_password ?: "" )];
         char *b64;
 
-        asprintf( &buf, "%s:%s", p_sys->proxy.psz_username,
-                   p_sys->proxy.psz_password ? p_sys->proxy.psz_password : "" );
-
+        snprintf( buf, sizeof( buf ), "%s:%s", p_sys->proxy.psz_username ?: "",
+                  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 );
+        if( b64 != NULL)
+        {
+            net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
+                        "Proxy-Authorization: Basic %s\r\n", b64 );
+            free( b64 );
+        }
     }
 
     /* ICY meta data request */
@@ -1017,7 +1017,7 @@ static int Request( access_t *p_access, int64_t i_tell )
     {
         p_sys->b_seekable = VLC_FALSE;
     }
-    if( p_sys->i_code != 206 )
+    if( p_sys->i_code != 206 && p_sys->i_code != 401 )
     {
         p_sys->b_seekable = VLC_FALSE;
     }
@@ -1079,8 +1079,32 @@ static int Request( access_t *p_access, int64_t i_tell )
         }
         else if( !strcasecmp( psz, "Location" ) )
         {
+            char * psz_new_loc;
+
+            /* This does not follow RFC 2068, but yet if the url is not absolute,
+             * handle it as everyone does. */
+            if( p[0] == '/' )
+            {
+                const char *psz_http_ext = p_sys->b_ssl ? "s" : "" ;
+
+                if( p_sys->url.i_port == ( p_sys->b_ssl ? 443 : 80 ) )
+                {
+                    asprintf(&psz_new_loc, "http%s://%s%s", psz_http_ext,
+                             p_sys->url.psz_host, p);
+                }
+                else
+                {
+                    asprintf(&psz_new_loc, "http%s://%s:%d%s", psz_http_ext,
+                             p_sys->url.psz_host, p_sys->url.i_port, p);
+                }
+            }
+            else
+            {
+                psz_new_loc = strdup( p );
+            }
+
             if( p_sys->psz_location ) free( p_sys->psz_location );
-            p_sys->psz_location = strdup( p );
+            p_sys->psz_location = psz_new_loc;
         }
         else if( !strcasecmp( psz, "Content-Type" ) )
         {
@@ -1185,5 +1209,5 @@ static void Disconnect( access_t *p_access )
         net_Close(p_sys->fd);
         p_sys->fd = -1;
     }
-    
+
 }