|
 |
20e9357 |
From 7da13e4babc17067b2b45d6b37041c3c8ed91637 Mon Sep 17 00:00:00 2001
|
|
|
20e9357 |
From: Remi Collet <remi@php.net>
|
|
|
20e9357 |
Date: Fri, 11 Jun 2021 08:05:40 +0200
|
|
|
20e9357 |
Subject: [PATCH] remove ZVAL_NEW_ARR usage
|
|
|
20e9357 |
|
|
|
20e9357 |
---
|
|
|
20e9357 |
php_gearman_worker.c | 2 +-
|
|
|
20e9357 |
tests/skipifconnect.inc | 2 +-
|
|
|
20e9357 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
20e9357 |
|
|
|
20e9357 |
diff --git a/php_gearman_worker.c b/php_gearman_worker.c
|
|
|
20e9357 |
index 21b64e4..7ab5f6e 100644
|
|
|
20e9357 |
--- a/php_gearman_worker.c
|
|
|
20e9357 |
+++ b/php_gearman_worker.c
|
|
|
20e9357 |
@@ -91,7 +91,7 @@ zend_object *gearman_worker_obj_new(zend_class_entry *ce) {
|
|
|
20e9357 |
zend_object_std_init(&(intern->std), ce);
|
|
|
20e9357 |
object_properties_init(&intern->std, ce);
|
|
|
20e9357 |
|
|
|
20e9357 |
- ZVAL_NEW_ARR(&intern->cb_list);
|
|
|
20e9357 |
+ array_init(&intern->cb_list);
|
|
|
20e9357 |
zend_hash_init(Z_ARRVAL(intern->cb_list), 0, NULL, cb_list_dtor, 0);
|
|
|
20e9357 |
|
|
|
20e9357 |
intern->std.handlers = &gearman_worker_obj_handlers;
|
|
|
20e9357 |
diff --git a/tests/skipifconnect.inc b/tests/skipifconnect.inc
|
|
|
20e9357 |
index e4df5e3..ca0e1db 100644
|
|
|
20e9357 |
--- a/tests/skipifconnect.inc
|
|
|
20e9357 |
+++ b/tests/skipifconnect.inc
|
|
|
20e9357 |
@@ -4,7 +4,7 @@ if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
|
|
|
20e9357 |
|
|
|
20e9357 |
require_once('connect.inc');
|
|
|
20e9357 |
|
|
|
20e9357 |
-$sock = fsockopen($host, $port);
|
|
|
20e9357 |
+$sock = @fsockopen($host, $port);
|
|
|
20e9357 |
if ($sock === false) {
|
|
|
20e9357 |
die("skip unable to connect");
|
|
|
20e9357 |
}
|