From abc2704db1193bd993b886463063059d1ff5050e Mon Sep 17 00:00:00 2001 From: Roman Arutyunyan Date: Thu, 13 Sep 2012 21:47:57 +0400 Subject: [PATCH] added merging up activity flag i nnotifiers --- ngx_rtmp_enotify_module.c | 4 ++++ ngx_rtmp_notify_module.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ngx_rtmp_enotify_module.c b/ngx_rtmp_enotify_module.c index d74588a..274209e 100644 --- a/ngx_rtmp_enotify_module.c +++ b/ngx_rtmp_enotify_module.c @@ -231,6 +231,10 @@ ngx_rtmp_enotify_merge_app_conf(ngx_conf_t *cf, void *parent, void *child) } } + if (conf->active) { + prev->active = 1; + } + return NGX_CONF_OK; } diff --git a/ngx_rtmp_notify_module.c b/ngx_rtmp_notify_module.c index d656e98..bb24f2e 100644 --- a/ngx_rtmp_notify_module.c +++ b/ngx_rtmp_notify_module.c @@ -167,6 +167,10 @@ ngx_rtmp_notify_merge_app_conf(ngx_conf_t *cf, void *parent, void *child) } } + if (conf->active) { + prev->active = 1; + } + return NGX_CONF_OK; }