Permalink
Browse files

added merging up activity flag i nnotifiers

  • Loading branch information...
1 parent 11cc6e6 commit abc2704db1193bd993b886463063059d1ff5050e @arut arut committed Sep 13, 2012
Showing with 8 additions and 0 deletions.
  1. +4 −0 ngx_rtmp_enotify_module.c
  2. +4 −0 ngx_rtmp_notify_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;
}
View
@@ -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;
}

0 comments on commit abc2704

Please sign in to comment.