Restore LibVLC/VERSION at the end of the HTTP user agent

[vlc] / modules / access / http.c

diff --git a/modules/access/http.c b/modules/access/http.c
index a23a2f80eb3e524790765e05af03975456d4d4ff..8485044568a22abfa872416538ddebbe0281b953 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -123,9 +123,10 @@ vlc_module_begin ()
     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,
+    add_string( "http-user-agent", NULL, NULL,
                 AGENT_TEXT, AGENT_LONGTEXT, true )
         change_safe()
+        change_need_restart()
     add_bool( "http-reconnect", false, NULL, RECONNECT_TEXT,
               RECONNECT_LONGTEXT, true )
     add_bool( "http-continuous", false, NULL, CONTINUOUS_TEXT,
@@ -141,11 +142,8 @@ vlc_module_begin ()
 #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 ()
 
@@ -247,7 +245,7 @@ static int Open( vlc_object_t *p_this )
 {
     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 );
 }
 
 /**
@@ -269,7 +267,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
     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 */
@@ -320,7 +318,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
     http_auth_Init( &p_sys->proxy_auth );
 
     /* Parse URI - remove spaces */
-    p = psz = strdup( p_access->psz_path );
+    p = psz = strdup( p_access->psz_location );
     while( (p = strchr( p, ' ' )) != NULL )
         *p = '+';
     vlc_UrlParse( &p_sys->url, psz, 0 );
@@ -344,11 +342,18 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_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;
@@ -363,7 +368,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
         {
             char *buf;
             int i;
-            i=asprintf(&buf, "%s://%s", psz_access, p_access->psz_path);
+            i=asprintf(&buf, "%s://%s", psz_access, p_access->psz_location);
             if (i >= 0)
             {
                 msg_Dbg(p_access, "asking libproxy about url '%s'", buf);
@@ -391,7 +396,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
 #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;
@@ -419,7 +424,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
                         {
                             /* 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=" );
@@ -449,7 +454,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
                           "in registry." );
         }
     }
-#elif HAVE_GETENV
+#elif defined( HAVE_GETENV )
     else
     {
         psz = getenv( "http_proxy" );
@@ -463,7 +468,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
 
     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;
     }
@@ -494,8 +499,8 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
         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 */
@@ -581,8 +586,8 @@ connect:
             msg_Err( p_access, "insecure redirection ignored" );
             goto error;
         }
-        free( p_access->psz_path );
-        p_access->psz_path = strdup( p_sys->psz_location );
+        free( p_access->psz_location );
+        p_access->psz_location = strdup( p_sys->psz_location );
         /* Clean up current Open() run */
         vlc_UrlClean( &p_sys->url );
         http_auth_Reset( &p_sys->auth );
@@ -1069,7 +1074,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         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;
 
         /* */
@@ -1279,7 +1284,8 @@ static int Request( access_t *p_access, uint64_t i_tell )
         }
     }
     /* 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 )
@@ -1287,6 +1293,7 @@ static int Request( access_t *p_access, uint64_t i_tell )
         p_sys->b_persist = true;
         net_Printf( p_access, p_sys->fd, pvs,
                     "Range: bytes=%"PRIu64"-\r\n", i_tell );
+        net_Printf( p_access, p_sys->fd, pvs, "Connection: close\r\n" );
     }
 
     /* Cookies */