File tree Expand file tree Collapse file tree 4 files changed +3
-15
lines changed Expand file tree Collapse file tree 4 files changed +3
-15
lines changed Original file line number Diff line number Diff line change @@ -239,8 +239,6 @@ PHP NEWS
239
239
. Use libenchant-2 when available.
240
240
241
241
- FPM:
242
- . Fixed bug #64865 (Search for .user.ini files from script dir up to
243
- CONTEXT_DOCUMENT_ROOT). (Will Bender)
244
242
. Add pm.status_listen option. (Jakub Zelenka)
245
243
246
244
- GD:
Original file line number Diff line number Diff line change @@ -845,10 +845,6 @@ PHP 8.0 UPGRADE NOTES
845
845
- Apache:
846
846
. The PHP module has been renamed from php7_module to php_module.
847
847
848
- - CGI and FPM will now use CONTEXT_DOCUMENT_ROOT to scan for .user.ini files,
849
- if it is defined. Otherwise, DOCUMENT_ROOT will be used as before. This
850
- improves support for Apache mod_userdir and mod_alias.
851
-
852
848
========================================
853
849
4. Deprecated Functionality
854
850
========================================
Original file line number Diff line number Diff line change @@ -914,12 +914,9 @@ static int sapi_cgi_activate(void)
914
914
if (fcgi_is_fastcgi ()) {
915
915
fcgi_request * request = (fcgi_request * ) SG (server_context );
916
916
917
- /* Prefer CONTEXT_DOCUMENT_ROOT if set */
918
- doc_root = FCGI_GETENV (request , "CONTEXT_DOCUMENT_ROOT" );
919
- doc_root = doc_root ? doc_root : FCGI_GETENV (request , "DOCUMENT_ROOT" );
917
+ doc_root = FCGI_GETENV (request , "DOCUMENT_ROOT" );
920
918
} else {
921
- doc_root = getenv ("CONTEXT_DOCUMENT_ROOT" );
922
- doc_root = doc_root ? doc_root : getenv ("DOCUMENT_ROOT" );
919
+ doc_root = getenv ("DOCUMENT_ROOT" );
923
920
}
924
921
/* DOCUMENT_ROOT should also be defined at this stage..but better check it anyway */
925
922
if (doc_root ) {
Original file line number Diff line number Diff line change @@ -729,10 +729,7 @@ static int sapi_cgi_activate(void) /* {{{ */
729
729
730
730
/* Load and activate user ini files in path starting from DOCUMENT_ROOT */
731
731
if (PG (user_ini_filename ) && * PG (user_ini_filename )) {
732
- /* Prefer CONTEXT_DOCUMENT_ROOT if set */
733
- doc_root = FCGI_GETENV (request , "CONTEXT_DOCUMENT_ROOT" );
734
- doc_root = doc_root ? doc_root : FCGI_GETENV (request , "DOCUMENT_ROOT" );
735
-
732
+ doc_root = FCGI_GETENV (request , "DOCUMENT_ROOT" );
736
733
/* DOCUMENT_ROOT should also be defined at this stage..but better check it anyway */
737
734
if (doc_root ) {
738
735
doc_root_len = strlen (doc_root );
You can’t perform that action at this time.
0 commit comments