diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-19 11:24:26 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-19 11:24:26 +0200 |
| commit | dbfa6aa9c4d93a9d7874151acf9ca5deb14f40bc (patch) | |
| tree | f992a8551e4943669f82fbca37a1798abd909bac | |
| parent | ec82c2067e33751534d94ffd787f7ad0e3b9dab9 (diff) | |
| parent | c97da0f819730c00905f9618aba0c54e8d592f74 (diff) | |
| download | php-git-dbfa6aa9c4d93a9d7874151acf9ca5deb14f40bc.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Revert "Fix bug #64865: Use CONTEXT_DOCUMENT_ROOT for scanning dir tree"
| -rw-r--r-- | sapi/cgi/cgi_main.c | 7 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 8048085ebe..d1d538345f 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -914,12 +914,9 @@ static int sapi_cgi_activate(void) if (fcgi_is_fastcgi()) { fcgi_request *request = (fcgi_request*) SG(server_context); - /* Prefer CONTEXT_DOCUMENT_ROOT if set */ - doc_root = FCGI_GETENV(request, "CONTEXT_DOCUMENT_ROOT"); - doc_root = doc_root ? doc_root : FCGI_GETENV(request, "DOCUMENT_ROOT"); + doc_root = FCGI_GETENV(request, "DOCUMENT_ROOT"); } else { - doc_root = getenv("CONTEXT_DOCUMENT_ROOT"); - doc_root = doc_root ? doc_root : getenv("DOCUMENT_ROOT"); + doc_root = getenv("DOCUMENT_ROOT"); } /* DOCUMENT_ROOT should also be defined at this stage..but better check it anyway */ if (doc_root) { diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index 84b9e5958a..7c11b3af8a 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -729,10 +729,7 @@ static int sapi_cgi_activate(void) /* {{{ */ /* Load and activate user ini files in path starting from DOCUMENT_ROOT */ if (PG(user_ini_filename) && *PG(user_ini_filename)) { - /* Prefer CONTEXT_DOCUMENT_ROOT if set */ - doc_root = FCGI_GETENV(request, "CONTEXT_DOCUMENT_ROOT"); - doc_root = doc_root ? doc_root : FCGI_GETENV(request, "DOCUMENT_ROOT"); - + doc_root = FCGI_GETENV(request, "DOCUMENT_ROOT"); /* DOCUMENT_ROOT should also be defined at this stage..but better check it anyway */ if (doc_root) { doc_root_len = strlen(doc_root); |