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.

diff --git a/NEWS b/NEWS
index 481d67ddcbf47941ae10a71f6b2e60b952f4853c..736ae5e0a32198890adbf50f3f6895a5466ccbf3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -239,8 +239,6 @@ PHP                                                                        NEWS
   . Use libenchant-2 when available.
 
 - FPM:
-  . Fixed bug #64865 (Search for .user.ini files from script dir up to
-    CONTEXT_DOCUMENT_ROOT). (Will Bender)
   . Add pm.status_listen option. (Jakub Zelenka)
 
 - GD:

diff --git a/UPGRADING b/UPGRADING
index a15feb826d87dee92f473c8c037be3138e46c952..a32e8e26438cf5472fe3b4e784a8f04aabca437f 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -845,10 +845,6 @@ PHP 8.0 UPGRADE NOTES
 - Apache:
   . The PHP module has been renamed from php7_module to php_module.
 
-- CGI and FPM will now use CONTEXT_DOCUMENT_ROOT to scan for .user.ini files,
-  if it is defined. Otherwise, DOCUMENT_ROOT will be used as before. This
-  improves support for Apache mod_userdir and mod_alias.
-
 ========================================
 4. Deprecated Functionality
 ========================================

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 8048085ebe0ee0853967931a3857715858177497..d1d538345f88812de3c249f4f8bef4d68fdc135b 100644 (file)
--- 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 84b9e5958a9a2bec116cb9f652284ad0f1124cfc..7c11b3af8a308e110b74e5369e2d2e27152857d0 100644 (file)
--- 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);