From c97da0f819730c00905f9618aba0c54e8d592f74 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 19 Oct 2020 11:22:32 +0200 Subject: 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. --- sapi/fpm/fpm/fpm_main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'sapi/fpm') 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); -- cgit v1.2.1