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

PHP: fixed script filename setting, broken after 2a71417d297f.

Browse Source
This commit is contained in:
Valentin Bartenev
2019-07-16 17:58:48 +03:00
parent ce1fbd9273
commit ef89815f03
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nxt_php_sapi.c
View File

@@ -180,7 +180,7 @@ static void ***tsrm_ls;
static nxt_int_t static nxt_int_t
nxt_php_init(nxt_task_t *task, nxt_common_app_conf_t *conf) nxt_php_init(nxt_task_t *task, nxt_common_app_conf_t *conf)
{ {
u_char *p; u_char *p, *tmp;
nxt_str_t ini_path; nxt_str_t ini_path;
nxt_str_t *root, *script_filename, *script_name, *index; nxt_str_t *root, *script_filename, *script_name, *index;
nxt_port_t *my_port, *main_port; nxt_port_t *my_port, *main_port;
@@ -221,24 +221,26 @@ nxt_php_init(nxt_task_t *task, nxt_common_app_conf_t *conf)
if (c->script.length > 0) { if (c->script.length > 0) {
nxt_php_str_trim_lead(&c->script, '/'); nxt_php_str_trim_lead(&c->script, '/');
p = nxt_malloc(root->length + 1 + c->script.length + 1); tmp = nxt_malloc(root->length + 1 + c->script.length + 1);
if (nxt_slow_path(p == NULL)) { if (nxt_slow_path(tmp == NULL)) {
return NXT_ERROR; return NXT_ERROR;
} }
p = tmp;
p = nxt_cpymem(p, root->start, root->length); p = nxt_cpymem(p, root->start, root->length);
*p++ = '/'; *p++ = '/';
p = nxt_cpymem(p, c->script.start, c->script.length); p = nxt_cpymem(p, c->script.start, c->script.length);
*p = '\0'; *p = '\0';
script_filename->start = nxt_realpath(p); script_filename->start = nxt_realpath(tmp);
if (nxt_slow_path(script_filename->start == NULL)) { if (nxt_slow_path(script_filename->start == NULL)) {
nxt_alert(task, "script realpath(%s) failed %E", p, nxt_errno); nxt_alert(task, "script realpath(%s) failed %E", tmp, nxt_errno);
return NXT_ERROR; return NXT_ERROR;
} }
nxt_free(p); nxt_free(tmp);
script_filename->length = nxt_strlen(script_filename->start); script_filename->length = nxt_strlen(script_filename->start);