mirror of
https://github.com/zotanmew/nginx-rtmp-module.git
synced 2024-06-03 07:09:31 +02:00
Merge branch 'master' of github.com:arut/nginx-rtmp-module
This commit is contained in:
commit
129a161fb8
|
@ -243,14 +243,11 @@ static ngx_int_t
|
||||||
ngx_rtmp_enotify_exec(ngx_rtmp_session_t *s, ngx_rtmp_enotify_conf_t *ec)
|
ngx_rtmp_enotify_exec(ngx_rtmp_session_t *s, ngx_rtmp_enotify_conf_t *ec)
|
||||||
{
|
{
|
||||||
#ifndef NGX_WIN32
|
#ifndef NGX_WIN32
|
||||||
ngx_rtmp_enotify_ctx_t *ctx;
|
|
||||||
int pid;
|
int pid;
|
||||||
ngx_str_t a, *arg;
|
ngx_str_t a, *arg;
|
||||||
char **args;
|
char **args;
|
||||||
ngx_uint_t n;
|
ngx_uint_t n;
|
||||||
|
|
||||||
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_enotify_module);
|
|
||||||
|
|
||||||
pid = fork();
|
pid = fork();
|
||||||
|
|
||||||
switch (pid) {
|
switch (pid) {
|
||||||
|
|
|
@ -341,14 +341,12 @@ ngx_rtmp_notify_done_create(ngx_rtmp_session_t *s, void *arg,
|
||||||
{
|
{
|
||||||
ngx_rtmp_notify_done_t *ds = arg;
|
ngx_rtmp_notify_done_t *ds = arg;
|
||||||
|
|
||||||
ngx_rtmp_notify_app_conf_t *nacf;
|
|
||||||
ngx_chain_t *hl, *cl, *pl;
|
ngx_chain_t *hl, *cl, *pl;
|
||||||
ngx_buf_t *b;
|
ngx_buf_t *b;
|
||||||
size_t cbname_len, name_len, args_len;
|
size_t cbname_len, name_len, args_len;
|
||||||
ngx_str_t *addr_text;
|
ngx_str_t *addr_text;
|
||||||
ngx_rtmp_notify_ctx_t *ctx;
|
ngx_rtmp_notify_ctx_t *ctx;
|
||||||
|
|
||||||
nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
|
|
||||||
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
|
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
|
||||||
|
|
||||||
/* common variables */
|
/* common variables */
|
||||||
|
|
Loading…
Reference in a new issue