File 0014-Revert-new-.user.ini-search-behavior.patch of Package scl-php73

Overview Repositories Revisions Requests Users Attributes Meta

File 0014-Revert-new-.user.ini-search-behavior.patch of Package scl-php73 (Revision a50b7b7f11fcde8a714b08dddbed5473)

Currently displaying revision a50b7b7f11fcde8a714b08dddbed5473 , Show latest

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tim Mullin <tim@cpanel.net>
Date: Mon, 18 May 2020 15:36:05 -0500
Subject: [PATCH 14/14] Revert new .user.ini search behavior

PHP issue #79491 (https://bugs.php.net/bug.php?id=79491)
introduced new behavior in searching for .user.ini
files.  We need to revert this for the time being
until we have confirmed that we and our customers
do not rely on the old behavior.
---
 sapi/cgi/cgi_main.c     | 6 +++---
 sapi/fpm/fpm/fpm_main.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 37f8eac..5959097 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -789,7 +789,7 @@ static void sapi_cgi_log_message(char *message, int syslog_type_int)
 
 /* {{{ php_cgi_ini_activate_user_config
  */
-static void php_cgi_ini_activate_user_config(char *path, size_t path_len, const char *doc_root, size_t doc_root_len)
+static void php_cgi_ini_activate_user_config(char *path, size_t path_len, const char *doc_root, size_t doc_root_len, int start)
 {
 	user_config_cache_entry *new_entry, *entry;
 	time_t request_time = (time_t)sapi_get_request_time();
@@ -842,7 +842,7 @@ static void php_cgi_ini_activate_user_config(char *path, size_t path_len, const
 #else
 		if (strncmp(s1, s2, s_len) == 0) {
 #endif
-			char *ptr = s2 + doc_root_len;
+			char *ptr = s2 + start;  /* start is the point where doc_root ends! */
 #ifdef PHP_WIN32
 			while ((ptr = strpbrk(ptr, "\\/")) != NULL) {
 #else
@@ -942,7 +942,7 @@ static int sapi_cgi_activate(void)
 				doc_root = estrndup(doc_root, doc_root_len);
 				zend_str_tolower(doc_root, doc_root_len);
 #endif
-				php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len);
+				php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len, (doc_root_len > 0 && (doc_root_len - 1)));
 
 #ifdef PHP_WIN32
 				efree(doc_root);
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index ba2a324..f01a0fc 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -627,7 +627,7 @@ static void sapi_cgi_log_message(char *message, int syslog_type_int)
 
 /* {{{ php_cgi_ini_activate_user_config
  */
-static void php_cgi_ini_activate_user_config(char *path, int path_len, const char *doc_root, int doc_root_len)
+static void php_cgi_ini_activate_user_config(char *path, int path_len, const char *doc_root, int doc_root_len, int start)
 {
 	char *ptr;
 	time_t request_time = sapi_get_request_time();
@@ -689,7 +689,7 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha
 			to find more user.ini, if not we only scan the current path.
 		  */
 		if (strncmp(s1, s2, s_len) == 0) {
-			ptr = s2 + doc_root_len;
+			ptr = s2 + start;  /* start is the point where doc_root ends! */
 			while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) {
 				*ptr = 0;
 				php_parse_user_ini_file(path, PG(user_ini_filename), entry->user_config);
@@ -763,7 +763,7 @@ static int sapi_cgi_activate(void) /* {{{ */
 					--doc_root_len;
 				}
 
-				php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len);
+				php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len, doc_root_len - 1);
 			}
 		}

Places

File 0014-Revert-new-.user.ini-search-behavior.patch of Package scl-php73 (Revision a50b7b7f11fcde8a714b08dddbed5473)

Places