diff options
author | Remi Collet <remi@remirepo.net> | 2017-12-28 11:39:52 +0100 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2017-12-28 11:39:52 +0100 |
commit | 9576aa13d8853801bca6c6dcf3cbfcabcc2af720 (patch) | |
tree | e2a7305bec63b615cf538113235dc9709c172e2b /5945408fc74922a25a5d3c1500363ce474eb87dc.patch | |
parent | 86798d680146b3e80e3f4ab68bace1148b3dd150 (diff) |
add upstream patch to fix broken build with PHP 5.xphp5
Diffstat (limited to '5945408fc74922a25a5d3c1500363ce474eb87dc.patch')
-rw-r--r-- | 5945408fc74922a25a5d3c1500363ce474eb87dc.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/5945408fc74922a25a5d3c1500363ce474eb87dc.patch b/5945408fc74922a25a5d3c1500363ce474eb87dc.patch new file mode 100644 index 0000000..5721de6 --- /dev/null +++ b/5945408fc74922a25a5d3c1500363ce474eb87dc.patch @@ -0,0 +1,24 @@ +From 5945408fc74922a25a5d3c1500363ce474eb87dc Mon Sep 17 00:00:00 2001 +From: matyhtf <mikan.tenny@gmail.com> +Date: Thu, 28 Dec 2017 18:25:05 +0800 +Subject: [PATCH] fix #1433 + +--- + swoole.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/swoole.c b/swoole.c +index 2db93e145..c97ac829d 100644 +--- a/swoole.c ++++ b/swoole.c +@@ -857,10 +857,6 @@ PHP_MINIT_FUNCTION(swoole) + zend_declare_property_bool(swoole_server_class_entry_ptr, ZEND_STRL("taskworker"), 0, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_long(swoole_server_class_entry_ptr, ZEND_STRL("worker_pid"), 0, ZEND_ACC_PUBLIC TSRMLS_CC); + +-#ifdef HAVE_PCRE +- zend_declare_property_null(swoole_server_class_entry_ptr, ZEND_STRL("connections"), ZEND_ACC_PUBLIC TSRMLS_CC); +-#endif +- + SWOOLE_INIT_CLASS_ENTRY(swoole_timer_ce, "swoole_timer", "Swoole\\Timer", swoole_timer_methods); + swoole_timer_class_entry_ptr = zend_register_internal_class(&swoole_timer_ce TSRMLS_CC); + SWOOLE_CLASS_ALIAS(swoole_timer, "Swoole\\Timer"); |