Deleted
Added
nxt_router.c (1940:29c2c9d80c5b) | nxt_router.c (1942:296628096d6c) |
---|---|
1 2/* 3 * Copyright (C) Igor Sysoev 4 * Copyright (C) Valentin V. Bartenev 5 * Copyright (C) NGINX, Inc. 6 */ 7 8#include <nxt_router.h> --- 1456 unchanged lines hidden (view full) --- 1465 static nxt_str_t listeners_path = nxt_string("/listeners"); 1466 static nxt_str_t routes_path = nxt_string("/routes"); 1467 static nxt_str_t access_log_path = nxt_string("/access_log"); 1468#if (NXT_TLS) 1469 static nxt_str_t certificate_path = nxt_string("/tls/certificate"); 1470 static nxt_str_t conf_commands_path = nxt_string("/tls/conf_commands"); 1471 static nxt_str_t conf_cache_path = nxt_string("/tls/session/cache_size"); 1472 static nxt_str_t conf_timeout_path = nxt_string("/tls/session/timeout"); | 1 2/* 3 * Copyright (C) Igor Sysoev 4 * Copyright (C) Valentin V. Bartenev 5 * Copyright (C) NGINX, Inc. 6 */ 7 8#include <nxt_router.h> --- 1456 unchanged lines hidden (view full) --- 1465 static nxt_str_t listeners_path = nxt_string("/listeners"); 1466 static nxt_str_t routes_path = nxt_string("/routes"); 1467 static nxt_str_t access_log_path = nxt_string("/access_log"); 1468#if (NXT_TLS) 1469 static nxt_str_t certificate_path = nxt_string("/tls/certificate"); 1470 static nxt_str_t conf_commands_path = nxt_string("/tls/conf_commands"); 1471 static nxt_str_t conf_cache_path = nxt_string("/tls/session/cache_size"); 1472 static nxt_str_t conf_timeout_path = nxt_string("/tls/session/timeout"); |
1473 static nxt_str_t conf_tickets = nxt_string("/tls/session/tickets"); |
|
1473#endif 1474 static nxt_str_t static_path = nxt_string("/settings/http/static"); 1475 static nxt_str_t websocket_path = nxt_string("/settings/http/websocket"); 1476 static nxt_str_t client_ip_path = nxt_string("/client_ip"); 1477 1478 conf = nxt_conf_json_parse(tmcf->mem_pool, start, end, NULL); 1479 if (conf == NULL) { 1480 nxt_alert(task, "configuration parsing error"); --- 391 unchanged lines hidden (view full) --- 1872 value = nxt_conf_get_path(listener, &conf_timeout_path); 1873 if (value != NULL) { 1874 tls_init->timeout = nxt_conf_get_number(value); 1875 } 1876 1877 tls_init->conf_cmds = nxt_conf_get_path(listener, 1878 &conf_commands_path); 1879 | 1474#endif 1475 static nxt_str_t static_path = nxt_string("/settings/http/static"); 1476 static nxt_str_t websocket_path = nxt_string("/settings/http/websocket"); 1477 static nxt_str_t client_ip_path = nxt_string("/client_ip"); 1478 1479 conf = nxt_conf_json_parse(tmcf->mem_pool, start, end, NULL); 1480 if (conf == NULL) { 1481 nxt_alert(task, "configuration parsing error"); --- 391 unchanged lines hidden (view full) --- 1873 value = nxt_conf_get_path(listener, &conf_timeout_path); 1874 if (value != NULL) { 1875 tls_init->timeout = nxt_conf_get_number(value); 1876 } 1877 1878 tls_init->conf_cmds = nxt_conf_get_path(listener, 1879 &conf_commands_path); 1880 |
1881 tls_init->tickets_conf = nxt_conf_get_path(listener, 1882 &conf_tickets); 1883 |
|
1880 if (nxt_conf_type(certificate) == NXT_CONF_ARRAY) { 1881 n = nxt_conf_array_elements_count(certificate); 1882 1883 for (i = 0; i < n; i++) { 1884 value = nxt_conf_get_array_element(certificate, i); 1885 1886 nxt_assert(value != NULL); 1887 --- 3994 unchanged lines hidden --- | 1884 if (nxt_conf_type(certificate) == NXT_CONF_ARRAY) { 1885 n = nxt_conf_array_elements_count(certificate); 1886 1887 for (i = 0; i < n; i++) { 1888 value = nxt_conf_get_array_element(certificate, i); 1889 1890 nxt_assert(value != NULL); 1891 --- 3994 unchanged lines hidden --- |