summaryrefslogtreecommitdiffstats
path: root/upstream.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-02-15 08:35:36 +0100
committerRemi Collet <remi@php.net>2023-02-15 08:35:36 +0100
commit940f9e4d06efcbdc30590117e4d0cf53b4046262 (patch)
tree07fe3e70199e6167cc5f6b6d7aa97c6c5ea57e49 /upstream.patch
parent4e12dd7b18751221868176116f5d31981899454b (diff)
Update to 8.1.16 - http://www.php.net/releases/8_1_16.phpv8.1.16
Diffstat (limited to 'upstream.patch')
-rw-r--r--upstream.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/upstream.patch b/upstream.patch
new file mode 100644
index 0000000..84d43da
--- /dev/null
+++ b/upstream.patch
@@ -0,0 +1,56 @@
+From e86d8704b44dde164e36b5364036e1988ac566fe Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Tue, 14 Feb 2023 14:13:40 +0100
+Subject: [PATCH] more config for new FPM tests
+
+---
+ sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt | 4 +++-
+ .../fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt | 4 +++-
+ sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt | 4 +++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
+index d2239ac3c410..d5c4c4d46987 100644
+--- a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
++++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
+@@ -21,7 +21,9 @@ php_admin_value[html_errors] = false
+ php_admin_value[max_input_vars] = 20
+ php_admin_value[max_file_uploads] = 5
+ php_admin_value[max_multipart_body_parts] = 10
+-php_flag[display_errors] = On
++php_admin_flag[display_errors] = On
++php_admin_flag[display_startup_errors] = On
++php_admin_flag[log_errors] = On
+ EOT;
+
+ $code = <<<EOT
+diff --git a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
+index 42b5afbf9ee7..c7e029371bba 100644
+--- a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
++++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
+@@ -20,7 +20,9 @@ pm.max_spare_servers = 3
+ php_admin_value[html_errors] = false
+ php_admin_value[max_input_vars] = 20
+ php_admin_value[max_file_uploads] = 5
+-php_flag[display_errors] = On
++php_admin_flag[display_errors] = On
++php_admin_flag[display_startup_errors] = On
++php_admin_flag[log_errors] = On
+ EOT;
+
+ $code = <<<EOT
+diff --git a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
+index da81174c7280..8c7ec54c799b 100644
+--- a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
++++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
+@@ -19,7 +19,9 @@ pm.min_spare_servers = 1
+ pm.max_spare_servers = 3
+ php_admin_value[html_errors] = false
+ php_admin_value[max_file_uploads] = 5
+-php_flag[display_errors] = On
++php_admin_flag[display_errors] = On
++php_admin_flag[display_startup_errors] = On
++php_admin_flag[log_errors] = On
+ EOT;
+
+ $code = <<<EOT