diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-20 10:48:05 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-20 10:48:05 +0200 |
| commit | 721ca87e56057b531ac3e431df52532a1e5d4ae6 (patch) | |
| tree | e9c1f5cc5f9c6ae997f0f36891b105c07a2f674a | |
| parent | a230b5a6c92ce816a7d660505e883a01065e4f9e (diff) | |
| parent | f62571c121ce2874858b5e7dd33642755ee9309c (diff) | |
| download | php-git-721ca87e56057b531ac3e431df52532a1e5d4ae6.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Apply doc root fix for FPM
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index b4daa4e4ca..839ed57eaa 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -620,7 +620,7 @@ static void sapi_cgi_log_message(char *message, int syslog_type_int) /* {{{ php_cgi_ini_activate_user_config */ -static void php_cgi_ini_activate_user_config(char *path, int path_len, const char *doc_root, int doc_root_len, int start) +static void php_cgi_ini_activate_user_config(char *path, int path_len, const char *doc_root, int doc_root_len) { char *ptr; time_t request_time = sapi_get_request_time(); @@ -670,7 +670,7 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha to find more user.ini, if not we only scan the current path. */ if (strncmp(s1, s2, s_len) == 0) { - ptr = s2 + start; /* start is the point where doc_root ends! */ + ptr = s2 + doc_root_len; while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) { *ptr = 0; php_parse_user_ini_file(path, PG(user_ini_filename), entry->user_config); @@ -744,7 +744,7 @@ static int sapi_cgi_activate(void) /* {{{ */ --doc_root_len; } - php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len, doc_root_len - 1); + php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len); } } |