From b78ed59b346fbca13d4ad0bcacf2b701f6de093f Mon Sep 17 00:00:00 2001 From: Jean-Paul Saman Date: Mon, 19 Nov 2007 15:36:33 +0000 Subject: [PATCH] Trigger intf_UserLoginPassword() when authorization of rtsp link failed while using --rtsp-http. --- modules/demux/live555.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp index 6eaea80689..ebbd3ada45 100644 --- a/modules/demux/live555.cpp +++ b/modules/demux/live555.cpp @@ -478,6 +478,7 @@ createnew: psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" ); } +describe: authenticator.setUsernameAndPassword( (const char*)psz_user, (const char*)psz_pwd ); @@ -485,7 +486,6 @@ createnew: &authenticator ); if( psz_options ) delete [] psz_options; -describe: p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator, var_CreateGetBool( p_demux, "rtsp-kasenna" ) ); @@ -499,7 +499,9 @@ describe: const char *psz_error = p_sys->env->getResultMsg(); msg_Dbg( p_demux, "DESCRIBE failed with %d: %s", i_code, psz_error ); - sscanf( psz_error, "%*sRTSP/%*s%3u", &i_code ); + if( var_CreateGetBool( p_demux, "rtsp-http" ) ) + sscanf( psz_error, "%*s %*s HTTP GET %*s HTTP/%*u.%*u %3u %*s", &i_code ); + else sscanf( psz_error, "%*sRTSP/%*s%3u", &i_code ); if( i_code == 401 ) { -- 2.39.2