From 9a9dc43b9b25b01c70df6284c0f2ce911749248e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 May 2017 08:36:57 +0200 Subject: cleanup --- stomp-upstream.patch | 56 ---------------------------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 stomp-upstream.patch (limited to 'stomp-upstream.patch') diff --git a/stomp-upstream.patch b/stomp-upstream.patch deleted file mode 100644 index d53e166..0000000 --- a/stomp-upstream.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2a6ef9570e309b6d2d58f03ed80e305d7b2ea4cb Mon Sep 17 00:00:00 2001 -From: Pierrick Charron -Date: Thu, 9 Jun 2016 13:27:54 -0400 -Subject: [PATCH] Remove useless zend_fcall_info.function_table - ---- - php_stomp.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/php_stomp.c b/php_stomp.c -index 96a08db..869e7ed 100644 ---- a/php_stomp.c -+++ b/php_stomp.c -@@ -963,8 +963,10 @@ PHP_FUNCTION(stomp_read_frame) - } - - fci.size = sizeof(fci); -+#if (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 0) - fci.function_table = &ce->function_table; - fci.symbol_table = NULL; -+#endif - - /* PARAMS */ - fci.param_count = 3; --- -2.1.4 - -From bd384b27c1ed0b188dd7fd21961d1f31628939cd Mon Sep 17 00:00:00 2001 -From: Pierrick Charron -Date: Thu, 9 Jun 2016 13:32:55 -0400 -Subject: [PATCH] get rid of EG(scope). zend_get_executed_scope() should be - used instead - ---- - php_stomp.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/php_stomp.c b/php_stomp.c -index 869e7ed..dcde51f 100644 ---- a/php_stomp.c -+++ b/php_stomp.c -@@ -982,7 +982,11 @@ PHP_FUNCTION(stomp_read_frame) - - fcc.initialized = 1; - fcc.function_handler = ce->constructor; -+#if (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 0) - fcc.calling_scope = EG(scope); -+#else -+ fcc.calling_scope = zend_get_executed_scope(); -+#endif - fcc.object = Z_OBJ_P(return_value); - - if (zend_call_function(&fci, &fcc ) == FAILURE) { --- -2.1.4 - -- cgit