technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Adding a missing slash to the tail of path set by --modules

Browse Source 
command line option.
This commit is contained in:
Igor Sysoev
2017-08-30 21:44:39 +03:00
parent 740dc67ec8
commit a812579842
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nxt_runtime.c
View File

@@ -705,8 +705,10 @@ static nxt_int_t
nxt_runtime_conf_init(nxt_task_t *task, nxt_runtime_t *rt) nxt_runtime_conf_init(nxt_task_t *task, nxt_runtime_t *rt)
{ {
nxt_int_t ret; nxt_int_t ret;
nxt_file_t *file;
nxt_str_t control; nxt_str_t control;
nxt_uint_t n;
nxt_file_t *file;
const char *slash;
nxt_sockaddr_t *sa; nxt_sockaddr_t *sa;
nxt_file_name_str_t file_name; nxt_file_name_str_t file_name;
const nxt_event_interface_t *interface; const nxt_event_interface_t *interface;
@@ -754,8 +756,15 @@ nxt_runtime_conf_init(nxt_task_t *task, nxt_runtime_t *rt)
file = nxt_list_first(rt->log_files); file = nxt_list_first(rt->log_files);
file->name = file_name.start; file->name = file_name.start;
ret = nxt_file_name_create(rt->mem_pool, &file_name, "%snginext.*%Z", slash = "";
rt->modules); n = nxt_strlen(rt->modules);
if (n > 1 && rt->modules[n - 1] != '/') {
slash = "/";
}
ret = nxt_file_name_create(rt->mem_pool, &file_name, "%s%snginext.*%Z",
rt->modules, slash);
if (nxt_slow_path(ret != NXT_OK)) { if (nxt_slow_path(ret != NXT_OK)) {
return NXT_ERROR; return NXT_ERROR;
} }