Skip to content

V
vlc-1.1
Commit 0196d42e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix RTSP error codes

parent 65bad3ef
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
modules/stream_out/rtp.c
View file @ 0196d42e
...@@ -1626,7 +1626,7 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, ...@@ -1626,7 +1626,7 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
if( ip == NULL ) if( ip == NULL )
{ {
answer->i_status = 400; answer->i_status = 500;
answer->psz_status = strdup( "Internal server error" ); answer->psz_status = strdup( "Internal server error" );
answer->i_body = 0; answer->i_body = 0;
answer->p_body = NULL; answer->p_body = NULL;
...@@ -1649,8 +1649,7 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, ...@@ -1649,8 +1649,7 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
rtsp = RtspClientGet( p_stream, psz_session ); rtsp = RtspClientGet( p_stream, psz_session );
if( rtsp == NULL ) if( rtsp == NULL )
{ {
/* FIXME right error code */ answer->i_status = 454;
answer->i_status = 400;
answer->psz_status = strdup( "Unknown session id" ); answer->psz_status = strdup( "Unknown session id" );
answer->i_body = 0; answer->i_body = 0;
answer->p_body = NULL; answer->p_body = NULL;
...@@ -1671,8 +1670,8 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, ...@@ -1671,8 +1670,8 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
{ {
msg_Err( p_stream, "cannot create the access out for %s://%s", msg_Err( p_stream, "cannot create the access out for %s://%s",
psz_access, psz_url ); psz_access, psz_url );
answer->i_status = 400; answer->i_status = 500;
answer->psz_status = strdup( "Server internal error" ); answer->psz_status = strdup( "Internal server error" );
answer->i_body = 0; answer->i_body = 0;
answer->p_body = NULL; answer->p_body = NULL;
break; break;
...@@ -1691,8 +1690,8 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, ...@@ -1691,8 +1690,8 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
} }
else /* TODO strstr( psz_transport, "interleaved" ) ) */ else /* TODO strstr( psz_transport, "interleaved" ) ) */
{ {
answer->i_status = 400; answer->i_status = 461;
answer->psz_status = strdup( "Bad Request" ); answer->psz_status = strdup( "Unsupported Transport" );
answer->i_body = 0; answer->i_body = 0;
answer->p_body = NULL; answer->p_body = NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment