1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From 7da13e4babc17067b2b45d6b37041c3c8ed91637 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Fri, 11 Jun 2021 08:05:40 +0200
Subject: [PATCH] remove ZVAL_NEW_ARR usage
---
php_gearman_worker.c | 2 +-
tests/skipifconnect.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/php_gearman_worker.c b/php_gearman_worker.c
index 21b64e4..7ab5f6e 100644
--- a/php_gearman_worker.c
+++ b/php_gearman_worker.c
@@ -91,7 +91,7 @@ zend_object *gearman_worker_obj_new(zend_class_entry *ce) {
zend_object_std_init(&(intern->std), ce);
object_properties_init(&intern->std, ce);
- ZVAL_NEW_ARR(&intern->cb_list);
+ array_init(&intern->cb_list);
zend_hash_init(Z_ARRVAL(intern->cb_list), 0, NULL, cb_list_dtor, 0);
intern->std.handlers = &gearman_worker_obj_handlers;
diff --git a/tests/skipifconnect.inc b/tests/skipifconnect.inc
index e4df5e3..ca0e1db 100644
--- a/tests/skipifconnect.inc
+++ b/tests/skipifconnect.inc
@@ -4,7 +4,7 @@ if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
require_once('connect.inc');
-$sock = fsockopen($host, $port);
+$sock = @fsockopen($host, $port);
if ($sock === false) {
die("skip unable to connect");
}
|
