opensource/nginx-rtmp-module
1
0
Fork 0
mirror of https://github.com/arut/nginx-rtmp-module.git synced 2025-08-06 15:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

added cutting off stream name args & removing trailing backslash from appname; thanks to spuzirev & semihalev

Browse Source
This commit is contained in:
Roman Arutyunyan
2012-06-08 14:51:05 +04:00
parent 108bae8695
commit eec4b7b401
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ngx_rtmp_cmd_module.c
View File

@ -61,6 +61,8 @@ static ngx_int_t
ngx_rtmp_cmd_connect_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, ngx_rtmp_cmd_connect_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
ngx_chain_t *in) ngx_chain_t *in)
{ {
size_t len;
static ngx_rtmp_connect_t v; static ngx_rtmp_connect_t v;
static ngx_rtmp_amf_elt_t in_cmd[] = { static ngx_rtmp_amf_elt_t in_cmd[] = {
@ -112,6 +114,11 @@ ngx_rtmp_cmd_connect_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
return NGX_ERROR; return NGX_ERROR;
} }
len = ngx_strlen(v.app);
if (len && v.app[len - 1] == '/') {
v.app[len - 1] = 0;
}
return ngx_rtmp_connect return ngx_rtmp_connect
? ngx_rtmp_connect(s, &v) ? ngx_rtmp_connect(s, &v)
: NGX_OK; : NGX_OK;
@ -363,6 +370,18 @@ ngx_rtmp_cmd_delete_stream(ngx_rtmp_session_t *s, ngx_rtmp_delete_stream_t *v)
} }
static void
ngx_rtmp_cmd_cutoff_args(u_char *s)
{
u_char *p;
p = (u_char *)ngx_strchr(s, '?');
if (p) {
*p = 0;
}
}
static ngx_int_t static ngx_int_t
ngx_rtmp_cmd_publish_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, ngx_rtmp_cmd_publish_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
ngx_chain_t *in) ngx_chain_t *in)
@ -398,6 +417,8 @@ ngx_rtmp_cmd_publish_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
return NGX_ERROR; return NGX_ERROR;
} }
ngx_rtmp_cmd_cutoff_args(v.name);
return ngx_rtmp_publish return ngx_rtmp_publish
? ngx_rtmp_publish(s, &v) ? ngx_rtmp_publish(s, &v)
: NGX_OK; : NGX_OK;
@ -605,6 +626,8 @@ ngx_rtmp_cmd_play_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
return NGX_ERROR; return NGX_ERROR;
} }
ngx_rtmp_cmd_cutoff_args(v.name);
return ngx_rtmp_play return ngx_rtmp_play
? ngx_rtmp_play(s, &v) ? ngx_rtmp_play(s, &v)
: NGX_OK; : NGX_OK;