From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 13 Jan 2026 20:07:59 +0000 (+0100)
Subject: - fix indentation, rediffed
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=85fea74e701639ed2e0705385ef086d6a7cc7247;p=packages%2Fphp.git

- fix indentation, rediffed
---

diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch
index 519866b..2fb5172 100644
--- a/php-sapi-ini-file.patch
+++ b/php-sapi-ini-file.patch
@@ -25,9 +25,9 @@ $ php -r 'var_dump(array(get_cfg_var("cfg_file_path"),php_ini_loaded_file()));'
 
 https://github.com/pld-linux/php/commit/762ec2e
 
---- php-8.5.1/main/php_ini.c.orig	2025-12-16 16:59:07.000000000 +0100
-+++ php-8.5.1/main/php_ini.c	2026-01-08 12:47:05.172174586 +0100
-@@ -64,6 +64,11 @@
+--- php-8.5.1/main/php_ini.c~	2025-12-16 16:59:07.000000000 +0100
++++ php-8.5.1/main/php_ini.c	2026-01-13 20:20:06.661936917 +0100
+@@ -64,6 +64,11 @@ static php_extension_lists extension_lis
  PHPAPI char *php_ini_scanned_path=NULL;
  PHPAPI char *php_ini_scanned_files=NULL;
  
@@ -39,7 +39,7 @@ https://github.com/pld-linux/php/commit/762ec2e
  /* {{{ php_ini_displayer_cb */
  static ZEND_COLD void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
  {
-@@ -635,12 +640,15 @@
+@@ -635,12 +640,14 @@ void php_init_config(void)
  		char *p;
  		zend_llist scanned_ini_list;
  		size_t total_l = 0;
@@ -50,19 +50,17 @@ https://github.com/pld-linux/php/commit/762ec2e
  		zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) free_estring, true);
  
 -		bufpath = estrdup(php_ini_scanned_path);
-+                bufpath = emalloc(strlen(php_ini_scanned_path) + strlen(fmt) + strlen(sapi_module.name));
-+                sprintf(bufpath, fmt, php_ini_scanned_path, sapi_module.name);
-+
++		bufpath = emalloc(strlen(php_ini_scanned_path) + strlen(fmt) + strlen(sapi_module.name));
++		sprintf(bufpath, fmt, php_ini_scanned_path, sapi_module.name);
  		for (debpath = bufpath ; debpath ; debpath=endpath) {
  			endpath = strchr(debpath, DEFAULT_DIR_SEPARATOR);
  			if (endpath) {
-@@ -654,7 +662,8 @@
+@@ -654,7 +661,7 @@ void php_init_config(void)
  			lenpath = strlen(debpath);
  
  			int ndir;
 -			if (lenpath > 0 && (ndir = php_scandir(debpath, &namelist, NULL, php_alphasort)) > 0) {
-+                        if (lenpath > 0 && (ndir = php_scandir(debpath, &namelist, 0, php_csort)) > 0) {
-+
++			if (lenpath > 0 && (ndir = php_scandir(debpath, &namelist, 0, php_csort)) > 0) {
  				for (int i = 0; i < ndir; i++) {
  
  					/* check for any file with .ini extension */