summaryrefslogtreecommitdiffstats
path: root/377d576a6e68def5708cf1ffcd3c233c4dddf356.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-06-26 17:50:42 +0200
committerRemi Collet <remi@remirepo.net>2018-06-26 17:50:42 +0200
commita967ec1ab12f53031cf393684b2faa888afd68b6 (patch)
tree995cc54c8ff95cc03f5d178500e59ff13a1860ca /377d576a6e68def5708cf1ffcd3c233c4dddf356.patch
parent3a580096baeb46c5bd3bf3369c41fac92c2973b8 (diff)
add upstream patches for PHP 7.3
Diffstat (limited to '377d576a6e68def5708cf1ffcd3c233c4dddf356.patch')
-rw-r--r--377d576a6e68def5708cf1ffcd3c233c4dddf356.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/377d576a6e68def5708cf1ffcd3c233c4dddf356.patch b/377d576a6e68def5708cf1ffcd3c233c4dddf356.patch
new file mode 100644
index 0000000..425c8b9
--- /dev/null
+++ b/377d576a6e68def5708cf1ffcd3c233c4dddf356.patch
@@ -0,0 +1,22 @@
+From 377d576a6e68def5708cf1ffcd3c233c4dddf356 Mon Sep 17 00:00:00 2001
+From: Michael Wallner <mike@php.net>
+Date: Tue, 26 Jun 2018 17:19:43 +0200
+Subject: [PATCH] fix shutdown crash with 7.3/master
+
+---
+ src/php_http_options.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/php_http_options.c b/src/php_http_options.c
+index d4be512..4cb6ed3 100644
+--- a/src/php_http_options.c
++++ b/src/php_http_options.c
+@@ -16,7 +16,7 @@ static void php_http_options_hash_dtor(zval *pData)
+ {
+ php_http_option_t *opt = Z_PTR_P(pData);
+
+- zval_ptr_dtor(&opt->defval);
++ zval_internal_dtor(&opt->defval);
+ zend_hash_destroy(&opt->suboptions.options);
+ zend_string_release(opt->name);
+ pefree(opt, opt->persistent);