diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-19 11:22:32 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-19 11:23:00 +0200 |
| commit | c97da0f819730c00905f9618aba0c54e8d592f74 (patch) | |
| tree | 24d638c6515165009d372cb34c2ad61b5dd8f3a9 /sapi/cgi/cgi_main.c | |
| parent | 7727a0227669a966221572831a6eb9bdfc9d953a (diff) | |
| download | php-git-c97da0f819730c00905f9618aba0c54e8d592f74.tar.gz | |
Revert "Fix bug #64865: Use CONTEXT_DOCUMENT_ROOT for scanning dir tree"
This reverts commit 98bfad738ad2734dfba5733323f7ba733daf3ec3.
This doesn't work well in some setups, see bug #80113 and GH-5051.
Reverting this for now.
Diffstat (limited to 'sapi/cgi/cgi_main.c')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 7 |
1 files changed, 2 insertions, 5 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) { |