arut / nginx-live-module Goto Github PK

diff --git a/src/ngx_http_live_module.c b/src/ngx_http_live_module.c
index cfa3905..7e6756b 100644
--- a/src/ngx_http_live_module.c
+++ b/src/ngx_http_live_module.c
@@ -1110,7 +1110,7 @@ ngx_http_live_init_module(ngx_cycle_t *cycle)
     size_t                      buffer_size;
     socklen_t                   olen;
     ngx_uint_t                  n, nfd;
-    ngx_socket_t               *p, fds[2];
+    ngx_socket_t               *sockets, fds[2];
     ngx_core_conf_t            *ccf;
     ngx_pool_cleanup_t         *cln;
     ngx_http_live_main_conf_t  *lmcf;
@@ -1125,13 +1125,13 @@ ngx_http_live_init_module(ngx_cycle_t *cycle)

     nfd = ccf->worker_processes;

-    p = ngx_palloc(cycle->pool, nfd * 2 * sizeof(ngx_socket_t));
-    if (p == NULL) {
+    sockets = ngx_palloc(cycle->pool, nfd * 2 * sizeof(ngx_socket_t));
+    if (sockets == NULL) {
         return NGX_ERROR;
     }

-    lmcf->read_fd = p;
-    lmcf->write_fd = p + nfd * sizeof(ngx_socket_t);
+    lmcf->read_fd = sockets;
+    lmcf->write_fd = sockets + nfd;

     cln = ngx_pool_cleanup_add(cycle->pool, 0);
     if (cln == NULL) {

diff --git a/src/ngx_http_live_module.c b/src/ngx_http_live_module.c
index e30812d..d7407c6 100644
--- a/src/ngx_http_live_module.c
+++ b/src/ngx_http_live_module.c
@@ -1291,6 +1291,10 @@ ngx_http_live_init_process(ngx_cycle_t *cycle)

     lmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_live_module);

+    if (ngx_process != NGX_PROCESS_WORKER) {
+        return NGX_OK;
+    }
+
     if (lmcf == NULL || lmcf->nfd == 0) {
         return NGX_OK;
     }

for (n = 0; n < lmcf->nfd; n++) {
        if (n == ngx_worker) {
            fd = lmcf->read_fd[n];
            continue;
        }
...