diff options
| -rw-r--r-- | REFLECTION | 21 | ||||
| -rw-r--r-- | php-pecl-swoole.spec | 12 | ||||
| -rw-r--r-- | swoole-el5.patch | 26 |
3 files changed, 23 insertions, 36 deletions
@@ -1,4 +1,4 @@ -Extension [ <persistent> extension #135 swoole version 1.7.2 ] { +Extension [ <persistent> extension #141 swoole version 1.7.3 ] { - INI { Entry [ swoole.task_worker_num <ALL> ] @@ -13,6 +13,9 @@ Extension [ <persistent> extension #135 swoole version 1.7.2 ] { Entry [ swoole.message_queue_key <ALL> ] Current = '0' } + Entry [ swoole.unixsock_buffer_size <ALL> ] + Current = '8388608' + } } - Constants [35] { @@ -50,7 +53,7 @@ Extension [ <persistent> extension #135 swoole version 1.7.2 ] { Constant [ integer SWOOLE_HOST ] { 16 } Constant [ integer SWOOLE_SHORT ] { 2 } Constant [ integer SWOOLE_INT ] { 4 } - Constant [ string SWOOLE_VERSION ] { 1.7.2 } + Constant [ string SWOOLE_VERSION ] { 1.7.3 } } - Functions { @@ -314,7 +317,7 @@ Extension [ <persistent> extension #135 swoole version 1.7.2 ] { - Properties [0] { } - - Methods [19] { + - Methods [20] { Method [ <internal:swoole, ctor> public method __construct ] { - Parameters [4] { @@ -428,6 +431,13 @@ Extension [ <persistent> extension #135 swoole version 1.7.2 ] { } } + Method [ <internal:swoole> public method heartbeat ] { + + - Parameters [1] { + Parameter #0 [ <required> $from_id ] + } + } + Method [ <internal:swoole> public method handler ] { - Parameters [2] { @@ -516,7 +526,7 @@ Extension [ <persistent> extension #135 swoole version 1.7.2 ] { - Properties [0] { } - - Methods [5] { + - Methods [6] { Method [ <internal:swoole, ctor> public method __construct ] { } @@ -531,6 +541,9 @@ Extension [ <persistent> extension #135 swoole version 1.7.2 ] { Method [ <internal:swoole> public method exit ] { } + + Method [ <internal:swoole> public method exec ] { + } } } } diff --git a/php-pecl-swoole.spec b/php-pecl-swoole.spec index 4ec1762..95b2a37 100644 --- a/php-pecl-swoole.spec +++ b/php-pecl-swoole.spec @@ -23,16 +23,13 @@ Summary: PHP's asynchronous concurrent distributed networking framework Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.7.2 +Version: 1.7.3 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -# https://github.com/matyhtf/swoole/pull/67 -Patch0: %{pecl_name}-el5.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -94,7 +91,6 @@ mv %{pecl_name}-%{version} NTS sed -e '/examples/s/role="src"/role="doc"/' -i package.xml cd NTS -%patch0 -p1 -b .el5 # Sanity check, really often broken extver=$(sed -n '/#define PHP_SWOOLE_VERSION/{s/.* "//;s/".*$//;p}' php_swoole.h) @@ -118,7 +114,8 @@ extension=%{pecl_name}.so ;swoole.task_worker_num = 0 ;swoole.task_ipc_mode = 0 ;swoole.task_auto_start = 0 -;swoole.message_queue_key =0 +;swoole.message_queue_key = 0 +;swoole.unixsock_buffer_size = 8388608 EOF @@ -222,6 +219,9 @@ rm -rf %{buildroot} %changelog +* Fri Jun 20 2014 Remi Collet <remi@fedoraproject.org> - 1.7.3-1 +- Update to 1.7.3 (stable) + * Fri May 30 2014 Remi Collet <remi@fedoraproject.org> - 1.7.2-1 - Update to 1.7.2 (stable) - open https://github.com/matyhtf/swoole/pull/67 (fix EL5 build) diff --git a/swoole-el5.patch b/swoole-el5.patch deleted file mode 100644 index ea36d74..0000000 --- a/swoole-el5.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up swoole-1.7.2/config.m4.old swoole-1.7.2/config.m4 ---- swoole-1.7.2/config.m4.old 2014-05-30 11:19:35.000000000 +0200 -+++ swoole-1.7.2/config.m4 2014-05-30 11:20:26.000000000 +0200 -@@ -245,6 +245,7 @@ if test "$PHP_SWOOLE" != "no"; then - AC_CHECK_LIB(c, accept4, AC_DEFINE(SW_USE_ACCEPT4, 1, [have accept4])) - AC_CHECK_LIB(c, signalfd, AC_DEFINE(HAVE_SIGNALFD, 1, [have signalfd])) - AC_CHECK_LIB(c, daemon, AC_DEFINE(HAVE_DAEMON, 1, [have daemon])) -+ AC_CHECK_LIB(c, mkostemp, AC_DEFINE(HAVE_MKOSTEMP, 1, [have mkostemp])) - AC_CHECK_LIB(pthread, pthread_spin_lock, AC_DEFINE(HAVE_SPINLOCK, 1, [have pthread_spin_lock])) - AC_CHECK_LIB(rt, clock_gettime, AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [have clock_gettime])) - -diff -up swoole-1.7.2/src/network/TaskWorker.c.old swoole-1.7.2/src/network/TaskWorker.c ---- swoole-1.7.2/src/network/TaskWorker.c.old 2014-05-30 11:21:10.000000000 +0200 -+++ swoole-1.7.2/src/network/TaskWorker.c 2014-05-30 11:23:18.000000000 +0200 -@@ -43,7 +43,11 @@ int swTaskWorker_large_pack(swEventData - { - swPackage_task pkg; - memcpy(pkg.tmpfile, SW_TASK_TMP_FILE, sizeof(SW_TASK_TMP_FILE)); -+#ifdef HAVE_MKOSTEMP - int tpm_fd = mkostemp(pkg.tmpfile, O_WRONLY); -+#else -+ int tpm_fd = mkstemp(pkg.tmpfile); -+#endif - if (tpm_fd < 0) - { - swWarn("mkdtemp() failed. Error: %s[%d]", strerror(errno), errno); |