[vlc-commits] http output: print warnings when setting the server address

Pierre Ynard git at videolan.org
Sun Dec 18 19:38:01 CET 2011


vlc/vlc-1.2 | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Sun Dec 18 19:04:27 2011 +0100| [9237b0e49b6552f35001bfaff7435f43e198361e] | committer: Pierre Ynard

http output: print warnings when setting the server address
(cherry picked from commit 03933a58ffe973ed91b0f9092fb3e5eafbfebbb0)

Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=9237b0e49b6552f35001bfaff7435f43e198361e
---

 modules/access_output/http.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index d153574..137d786 100644
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -142,7 +142,6 @@ static int Open( vlc_object_t *p_this )
     config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
 
     const char *path = p_access->psz_path;
-    /* Skip everything before / - backward compatibiltiy with VLC 1.1 */
     path += strcspn( path, "/" );
     if( path > p_access->psz_path )
     {
@@ -152,10 +151,11 @@ static int Open( vlc_object_t *p_this )
         if( port != p_access->psz_path )
         {
             int len = (port ? port : path) - p_access->psz_path;
-            /* msg_Err( p_access, "\"%.*s\" HTTP host ignored", len,
-                     p_access->psz_path );
-            msg_Info( p_access,
-                      "Pass --http-host=IP on the command line instead." ); */
+            msg_Warn( p_access, "\"%.*s\" HTTP host might be ignored in "
+                      "multiple-host configurations, use at your own risks.",
+                      len, p_access->psz_path );
+            msg_Info( p_access, "Consider passing --http-host=IP on the "
+                                "command line instead." );
 
             char host[len + 1];
             strncpy( host, p_access->psz_path, len );
@@ -167,9 +167,9 @@ static int Open( vlc_object_t *p_this )
         if( port != NULL )
         {
             /* int len = path - ++port;
-            msg_Err( p_access, "\"%.*s\" HTTP port ignored", len, port );
-            msg_Info( p_access, "Pass --%s-port=%.*s on the command line "
-                      "instead.", strcasecmp( p_access->psz_access, "https" )
+            msg_Info( p_access, "Consider passing --%s-port=%.*s on the "
+                                "command line instead.",
+                      strcasecmp( p_access->psz_access, "https" )
                       ? "http" : "https", len, port ); */
             port++;
 



More information about the vlc-commits mailing list