Skip to content

Commit e6b9d3a

Browse files
committed
Update patches
1 parent 84f4bc2 commit e6b9d3a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

patches/8.3/dmalloc.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ See: https://github.com/php/php-src/pull/8465
99
1 file changed, 2 insertions(+), 1 deletion(-)
1010

1111
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
12-
index a09f273a70..dac2bbc5f1 100644
12+
index aa54cf9c7b..0c91b9f890 100644
1313
--- a/sapi/cli/php_cli_server.c
1414
+++ b/sapi/cli/php_cli_server.c
1515
@@ -15,6 +15,8 @@

patches/8.4/dmalloc.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ See: https://github.com/php/php-src/pull/8465
99
1 file changed, 2 insertions(+), 1 deletion(-)
1010

1111
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
12-
index a720ce32e3..bbda7e8cfd 100644
12+
index 654f3ee680..723b443434 100644
1313
--- a/sapi/cli/php_cli_server.c
1414
+++ b/sapi/cli/php_cli_server.c
1515
@@ -15,6 +15,8 @@

patches/8.5/cmake.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ index e691bd3964..fff9fc09d0 100644
118118
+CMakeScripts/
119119
+/TryRunResults.cmake
120120
diff --git a/run-tests.php b/run-tests.php
121-
index 5587c6c0ae..ff5932bfde 100755
121+
index 0dee752d32..b6eb316fa0 100755
122122
--- a/run-tests.php
123123
+++ b/run-tests.php
124124
@@ -865,10 +865,12 @@ function write_information(array $user_tests, $phpdbg): void
@@ -127,12 +127,12 @@ index 5587c6c0ae..ff5932bfde 100755
127127
$ext_dir = ini_get('extension_dir');
128128
- foreach (scandir($ext_dir) as $file) {
129129
- if (preg_match('/^(?:php_)?([_a-zA-Z0-9]+)\.(?:so|dll)$/', $file, $matches)) {
130-
- if (!extension_loaded($matches[1]) && @dl($matches[1])) {
130+
- if (!extension_loaded($matches[1])) {
131131
- $exts[] = $matches[1];
132132
+ if (is_dir($ext_dir)) {
133133
+ foreach (scandir($ext_dir) as $file) {
134134
+ if (preg_match('/^(?:php_)?([_a-zA-Z0-9]+)\.(?:so|dll)$/', $file, $matches)) {
135-
+ if (!extension_loaded($matches[1]) && @dl($matches[1])) {
135+
+ if (!extension_loaded($matches[1])) {
136136
+ $exts[] = $matches[1];
137137
+ }
138138
}

patches/8.5/dmalloc.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ See: https://github.com/php/php-src/pull/8465
99
1 file changed, 2 insertions(+), 1 deletion(-)
1010

1111
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
12-
index a720ce32e3..bbda7e8cfd 100644
12+
index 654f3ee680..723b443434 100644
1313
--- a/sapi/cli/php_cli_server.c
1414
+++ b/sapi/cli/php_cli_server.c
1515
@@ -15,6 +15,8 @@

0 commit comments

Comments
 (0)