Merge branch 'master' of github.com:arut/nginx-rtmp-module

This commit is contained in:
Roman Arutyunyan 2012-09-14 16:51:17 +04:00
commit 129a161fb8
2 changed files with 0 additions and 5 deletions

View file

@ -243,14 +243,11 @@ static ngx_int_t
ngx_rtmp_enotify_exec(ngx_rtmp_session_t *s, ngx_rtmp_enotify_conf_t *ec)
{
#ifndef NGX_WIN32
ngx_rtmp_enotify_ctx_t *ctx;
int pid;
ngx_str_t a, *arg;
char **args;
ngx_uint_t n;
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_enotify_module);
pid = fork();
switch (pid) {

View file

@ -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_app_conf_t *nacf;
ngx_chain_t *hl, *cl, *pl;
ngx_buf_t *b;
size_t cbname_len, name_len, args_len;
ngx_str_t *addr_text;
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);
/* common variables */