Skip to content

Commit 5c2d976

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
2 parents e6669c9 + c88924f commit 5c2d976

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

patches/8.3/dmalloc.patch

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

1212
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
13-
index 8d67fb2864c..2af07fe44ba 100644
13+
index df01d3df911..d197a7d779a 100644
1414
--- a/sapi/cli/php_cli_server.c
1515
+++ b/sapi/cli/php_cli_server.c
1616
@@ -15,6 +15,8 @@

patches/8.4/dmalloc.patch

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

1212
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
13-
index 68c4b3b411d..9fd6bfe0dd5 100644
13+
index ebac47d6864..d237d4d479a 100644
1414
--- a/sapi/cli/php_cli_server.c
1515
+++ b/sapi/cli/php_cli_server.c
1616
@@ -15,6 +15,8 @@

patches/8.5/dmalloc.patch

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

1212
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
13-
index da6732f06e7..b4f701f74e6 100644
13+
index ae56d143c90..b3ca86bb05d 100644
1414
--- a/sapi/cli/php_cli_server.c
1515
+++ b/sapi/cli/php_cli_server.c
1616
@@ -15,6 +15,8 @@

patches/8.6/dmalloc.patch

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

1212
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
13-
index da6732f06e7..b4f701f74e6 100644
13+
index ae56d143c90..b3ca86bb05d 100644
1414
--- a/sapi/cli/php_cli_server.c
1515
+++ b/sapi/cli/php_cli_server.c
1616
@@ -15,6 +15,8 @@

0 commit comments

Comments
 (0)