Deleted
Added
nxt_main_process.c (1211:55773d33e999) | nxt_main_process.c (1235:4d5998f60f20) |
---|---|
1 2/* 3 * Copyright (C) Igor Sysoev 4 * Copyright (C) NGINX, Inc. 5 */ 6 7#include <nxt_main.h> 8#include <nxt_runtime.h> --- 56 unchanged lines hidden (view full) --- 65static int nxt_cdecl nxt_app_lang_compare(const void *v1, const void *v2); 66static void nxt_main_port_conf_store_handler(nxt_task_t *task, 67 nxt_port_recv_msg_t *msg); 68static void nxt_main_port_access_log_handler(nxt_task_t *task, 69 nxt_port_recv_msg_t *msg); 70 71static nxt_int_t nxt_init_set_isolation(nxt_task_t *task, 72 nxt_process_init_t *init, nxt_conf_value_t *isolation); | 1 2/* 3 * Copyright (C) Igor Sysoev 4 * Copyright (C) NGINX, Inc. 5 */ 6 7#include <nxt_main.h> 8#include <nxt_runtime.h> --- 56 unchanged lines hidden (view full) --- 65static int nxt_cdecl nxt_app_lang_compare(const void *v1, const void *v2); 66static void nxt_main_port_conf_store_handler(nxt_task_t *task, 67 nxt_port_recv_msg_t *msg); 68static void nxt_main_port_access_log_handler(nxt_task_t *task, 69 nxt_port_recv_msg_t *msg); 70 71static nxt_int_t nxt_init_set_isolation(nxt_task_t *task, 72 nxt_process_init_t *init, nxt_conf_value_t *isolation); |
73static nxt_int_t nxt_init_set_ns(nxt_task_t *task, 74 nxt_process_init_t *init, nxt_conf_value_t *ns); | 73static nxt_int_t nxt_init_set_ns(nxt_task_t *task, nxt_process_init_t *init, 74 nxt_conf_value_t *ns); |
75 76const nxt_sig_event_t nxt_main_process_signals[] = { 77 nxt_event_signal(SIGHUP, nxt_main_process_signal_handler), 78 nxt_event_signal(SIGINT, nxt_main_process_sigterm_handler), 79 nxt_event_signal(SIGQUIT, nxt_main_process_sigquit_handler), 80 nxt_event_signal(SIGTERM, nxt_main_process_sigterm_handler), 81 nxt_event_signal(SIGCHLD, nxt_main_process_sigchld_handler), 82 nxt_event_signal(SIGUSR1, nxt_main_process_sigusr1_handler), --- 1452 unchanged lines hidden (view full) --- 1535 init->isolation.clone.gidmap = object; 1536 } 1537 1538 return NXT_OK; 1539} 1540 1541 1542static nxt_int_t | 75 76const nxt_sig_event_t nxt_main_process_signals[] = { 77 nxt_event_signal(SIGHUP, nxt_main_process_signal_handler), 78 nxt_event_signal(SIGINT, nxt_main_process_sigterm_handler), 79 nxt_event_signal(SIGQUIT, nxt_main_process_sigquit_handler), 80 nxt_event_signal(SIGTERM, nxt_main_process_sigterm_handler), 81 nxt_event_signal(SIGCHLD, nxt_main_process_sigchld_handler), 82 nxt_event_signal(SIGUSR1, nxt_main_process_sigusr1_handler), --- 1452 unchanged lines hidden (view full) --- 1535 init->isolation.clone.gidmap = object; 1536 } 1537 1538 return NXT_OK; 1539} 1540 1541 1542static nxt_int_t |
1543nxt_init_set_ns(nxt_task_t *task, nxt_process_init_t *init, nxt_conf_value_t *namespaces) | 1543nxt_init_set_ns(nxt_task_t *task, nxt_process_init_t *init, 1544 nxt_conf_value_t *namespaces) |
1544{ 1545 uint32_t index; 1546 nxt_str_t name; 1547 nxt_int_t flag; 1548 nxt_conf_value_t *value; 1549 1550 index = 0; 1551 | 1545{ 1546 uint32_t index; 1547 nxt_str_t name; 1548 nxt_int_t flag; 1549 nxt_conf_value_t *value; 1550 1551 index = 0; 1552 |
1552 while ((value = nxt_conf_next_object_member(namespaces, &name, &index)) != NULL) { | 1553 for ( ;; ) { 1554 value = nxt_conf_next_object_member(namespaces, &name, &index); 1555 1556 if (value == NULL) { 1557 break; 1558 } 1559 |
1553 flag = 0; 1554 1555#if (NXT_HAVE_CLONE_NEWUSER) 1556 if (nxt_str_eq(&name, "credential", 10)) { 1557 flag = CLONE_NEWUSER; 1558 } 1559#endif 1560 --- 44 unchanged lines hidden --- | 1560 flag = 0; 1561 1562#if (NXT_HAVE_CLONE_NEWUSER) 1563 if (nxt_str_eq(&name, "credential", 10)) { 1564 flag = CLONE_NEWUSER; 1565 } 1566#endif 1567 --- 44 unchanged lines hidden --- |