diff options
Diffstat (limited to '12117.patch')
| -rw-r--r-- | 12117.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/12117.patch b/12117.patch new file mode 100644 index 0000000..243b353 --- /dev/null +++ b/12117.patch @@ -0,0 +1,40 @@ +From f466b508c1d1043a96caffef59713de517de6362 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 8 Aug 2017 07:13:55 +0200 +Subject: [PATCH] Fix #12114 missing TSRMLS for zts BUILD + +--- + src/php/ext/grpc/channel.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/php/ext/grpc/channel.c b/src/php/ext/grpc/channel.c +index f1187e8722f..874e24b408d 100644 +--- a/src/php/ext/grpc/channel.c ++++ b/src/php/ext/grpc/channel.c +@@ -158,7 +158,7 @@ void create_and_add_channel_to_persistent_list( + grpc_channel_args args, + wrapped_grpc_channel_credentials *creds, + char *key, +- php_grpc_int key_len) { ++ php_grpc_int key_len TSRMLS_DC) { + php_grpc_zend_resource new_rsrc; + channel_persistent_le_t *le; + // this links each persistent list entry to a destructor +@@ -293,7 +293,7 @@ PHP_METHOD(Channel, __construct) { + } else if (!(PHP_GRPC_PERSISTENT_LIST_FIND(&EG(persistent_list), key, + key_len, rsrc))) { + create_and_add_channel_to_persistent_list( +- channel, target, args, creds, key, key_len); ++ channel, target, args, creds, key, key_len TSRMLS_CC); + } else { + // Found a previously stored channel in the persistent list + channel_persistent_le_t *le = (channel_persistent_le_t *)rsrc->ptr; +@@ -303,7 +303,7 @@ PHP_METHOD(Channel, __construct) { + strcmp(creds->hashstr, le->channel->creds_hashstr) != 0)) { + // somehow hash collision + create_and_add_channel_to_persistent_list( +- channel, target, args, creds, key, key_len); ++ channel, target, args, creds, key, key_len TSRMLS_CC); + } else { + channel->wrapper = le->channel; + } |