php-pecl-swoole: 1.7.10

2 files changed, 288 insertions, 59 deletions

diff --git a/REFLECTION b/REFLECTION
index 4f50ff6..6f4b313 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
+Extension [ <persistent> extension #147 swoole version 1.7.10 ] {
 
   - INI {
     Entry [ swoole.aio_thread_num <ALL> ]
@@ -15,10 +15,11 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
     }
   }
 
-  - Constants [41] {
+  - Constants [42] {
     Constant [ integer SWOOLE_BASE ] { 4 }
     Constant [ integer SWOOLE_THREAD ] { 2 }
     Constant [ integer SWOOLE_PROCESS ] { 3 }
+    Constant [ integer SWOOLE_PACKET ] { 16 }
     Constant [ integer SWOOLE_IPC_UNSOCK ] { 1 }
     Constant [ integer SWOOLE_IPC_MSGQUEUE ] { 2 }
     Constant [ integer SWOOLE_IPC_CHANNEL ] { 3 }
@@ -47,16 +48,16 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
     Constant [ integer SWOOLE_SSL ] { 512 }
     Constant [ integer SWOOLE_EVENT_READ ] { 512 }
     Constant [ integer SWOOLE_EVENT_WRITE ] { 1024 }
-    Constant [ string SWOOLE_VERSION ] { 1.7.9 }
+    Constant [ string SWOOLE_VERSION ] { 1.7.10 }
     Constant [ integer SWOOLE_AIO_BASE ] { 0 }
     Constant [ integer SWOOLE_AIO_GCC ] { 1 }
     Constant [ integer SWOOLE_AIO_LINUX ] { 2 }
+    Constant [ integer HTTP_GLOBAL_GET ] { 2 }
+    Constant [ integer HTTP_GLOBAL_POST ] { 4 }
+    Constant [ integer HTTP_GLOBAL_COOKIE ] { 8 }
+    Constant [ integer HTTP_GLOBAL_ALL ] { 62 }
     Constant [ integer WEBSOCKET_OPCODE_TEXT ] { 1 }
     Constant [ integer WEBSOCKET_OPCODE_BINARY ] { 2 }
-    Constant [ integer HTTP_GLOBAL_GET ] { 1 }
-    Constant [ integer HTTP_GLOBAL_POST ] { 2 }
-    Constant [ integer HTTP_GLOBAL_COOKIE ] { 4 }
-    Constant [ integer HTTP_GLOBAL_ALL ] { 31 }
   }
 
   - Functions {
@@ -95,6 +96,15 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
         Parameter #3 [ <optional> $from_id ]
       }
     }
+    Function [ <internal:swoole> function swoole_server_sendto ] {
+
+      - Parameters [4] {
+        Parameter #0 [ <required> swoole_server $zobject ]
+        Parameter #1 [ <required> $ip ]
+        Parameter #2 [ <required> $port ]
+        Parameter #3 [ <optional> $send_data ]
+      }
+    }
     Function [ <internal:swoole> function swoole_server_sendfile ] {
 
       - Parameters [3] {
@@ -142,13 +152,6 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
         Parameter #1 [ <required> $interval ]
       }
     }
-    Function [ <internal:swoole> function swoole_server_deltimer ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> swoole_server $zobject ]
-        Parameter #1 [ <required> $interval ]
-      }
-    }
     Function [ <internal:swoole> function swoole_server_gettimer ] {
     }
     Function [ <internal:swoole> function swoole_server_task ] {
@@ -257,6 +260,8 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
     }
     Function [ <internal:swoole> function swoole_timer_after ] {
     }
+    Function [ <internal:swoole> function swoole_timer_clear ] {
+    }
     Function [ <internal:swoole> function swoole_async_set ] {
     }
     Function [ <internal:swoole> function swoole_async_read ] {
@@ -298,7 +303,7 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
       - Properties [0] {
       }
 
-      - Methods [26] {
+      - Methods [28] {
         Method [ <internal:swoole, ctor> public method __construct ] {
 
           - Parameters [4] {
@@ -331,6 +336,15 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
           }
         }
 
+        Method [ <internal:swoole> public method sendto ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> $ip ]
+            Parameter #1 [ <required> $port ]
+            Parameter #2 [ <optional> $send_data ]
+          }
+        }
+
         Method [ <internal:swoole> public method sendfile ] {
 
           - Parameters [2] {
@@ -379,23 +393,6 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
           }
         }
 
-        Method [ <internal:swoole> public method addtimer ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $interval ]
-          }
-        }
-
-        Method [ <internal:swoole> public method deltimer ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $interval ]
-          }
-        }
-
-        Method [ <internal:swoole> public method gettimer ] {
-        }
-
         Method [ <internal:swoole> public method reload ] {
 
           - Parameters [0] {
@@ -454,9 +451,29 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
           }
         }
 
+        Method [ <internal:swoole> public method addtimer ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $interval ]
+          }
+        }
+
+        Method [ <internal:swoole> public method deltimer ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $interval ]
+          }
+        }
+
+        Method [ <internal:swoole> public method gettimer ] {
+        }
+
         Method [ <internal:swoole> public method after ] {
         }
 
+        Method [ <internal:swoole> public method clearAfter ] {
+        }
+
         Method [ <internal:swoole> public method sendmessage ] {
         }
 
@@ -788,7 +805,7 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
         Property [ <default> private $global ]
       }
 
-      - Methods [27] {
+      - Methods [29] {
         Method [ <internal:swoole, overwrites swoole_server, prototype swoole_server> public method on ] {
 
           - Parameters [2] {
@@ -829,6 +846,15 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
           }
         }
 
+        Method [ <internal:swoole, inherits swoole_server> public method sendto ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> $ip ]
+            Parameter #1 [ <required> $port ]
+            Parameter #2 [ <optional> $send_data ]
+          }
+        }
+
         Method [ <internal:swoole, inherits swoole_server> public method sendfile ] {
 
           - Parameters [2] {
@@ -877,23 +903,6 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
           }
         }
 
-        Method [ <internal:swoole, inherits swoole_server> public method addtimer ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $interval ]
-          }
-        }
-
-        Method [ <internal:swoole, inherits swoole_server> public method deltimer ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $interval ]
-          }
-        }
-
-        Method [ <internal:swoole, inherits swoole_server> public method gettimer ] {
-        }
-
         Method [ <internal:swoole, inherits swoole_server> public method reload ] {
 
           - Parameters [0] {
@@ -944,9 +953,29 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
           }
         }
 
+        Method [ <internal:swoole, inherits swoole_server> public method addtimer ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $interval ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method deltimer ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $interval ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method gettimer ] {
+        }
+
         Method [ <internal:swoole, inherits swoole_server> public method after ] {
         }
 
+        Method [ <internal:swoole, inherits swoole_server> public method clearAfter ] {
+        }
+
         Method [ <internal:swoole, inherits swoole_server> public method sendmessage ] {
         }
 
@@ -1018,7 +1047,7 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
       }
     }
 
-    Class [ <internal:swoole> class swoole_http_wsresponse ] {
+    Class [ <internal:swoole> class swoole_websocket_server extends swoole_http_server ] {
 
       - Constants [0] {
       }
@@ -1032,8 +1061,195 @@ Extension [ <persistent> extension #146 swoole version 1.7.9 ] {
       - Properties [0] {
       }
 
-      - Methods [1] {
-        Method [ <internal:swoole> public method message ] {
+      - Methods [30] {
+        Method [ <internal:swoole, overwrites swoole_http_server, prototype swoole_server> public method on ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $ha_name ]
+            Parameter #1 [ <required> $cb ]
+          }
+        }
+
+        Method [ <internal:swoole> public method push ] {
+        }
+
+        Method [ <internal:swoole, inherits swoole_http_server> public method setGlobal ] {
+        }
+
+        Method [ <internal:swoole, inherits swoole_http_server, prototype swoole_server> public method start ] {
+        }
+
+        Method [ <internal:swoole, inherits swoole_server, ctor> public method __construct ] {
+
+          - Parameters [4] {
+            Parameter #0 [ <required> $serv_host ]
+            Parameter #1 [ <required> $serv_port ]
+            Parameter #2 [ <optional> $serv_mode ]
+            Parameter #3 [ <optional> $sock_type ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method set ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $zset ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method send ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> $conn_fd ]
+            Parameter #1 [ <required> $send_data ]
+            Parameter #2 [ <optional> $from_id ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method sendto ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> $ip ]
+            Parameter #1 [ <required> $port ]
+            Parameter #2 [ <optional> $send_data ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method sendfile ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $conn_fd ]
+            Parameter #1 [ <required> $filename ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method close ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $fd ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method task ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $data ]
+            Parameter #1 [ <required> $worker_id ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method taskwait ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> $data ]
+            Parameter #1 [ <optional> $timeout ]
+            Parameter #2 [ <optional> $worker_id ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method finish ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $data ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method addlistener ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> $host ]
+            Parameter #1 [ <required> $port ]
+            Parameter #2 [ <required> $sock_type ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method reload ] {
+
+          - Parameters [0] {
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method shutdown ] {
+
+          - Parameters [0] {
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method hbcheck ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $from_id ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method heartbeat ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $from_id ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method handler ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $ha_name ]
+            Parameter #1 [ <required> $cb ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method connection_info ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $fd ]
+            Parameter #1 [ <required> $from_id ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method connection_list ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $start_fd ]
+            Parameter #1 [ <required> $find_count ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method addtimer ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $interval ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method deltimer ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $interval ]
+          }
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method gettimer ] {
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method after ] {
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method clearAfter ] {
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method sendmessage ] {
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method addprocess ] {
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method stats ] {
+        }
+
+        Method [ <internal:swoole, inherits swoole_server> public method bind ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $fd ]
+            Parameter #1 [ <required> $uid ]
+          }
         }
       }
     }
diff --git a/php-pecl-swoole.spec b/php-pecl-swoole.spec
index acae7e2..6aa5f28 100644
--- a/php-pecl-swoole.spec
+++ b/php-pecl-swoole.spec
@@ -23,7 +23,7 @@
 
 Summary:        PHP's asynchronous concurrent distributed networking framework
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
-Version:        1.7.9
+Version:        1.7.10
 Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        BSD
 Group:          Development/Languages
@@ -37,8 +37,6 @@ BuildRequires:  %{?scl_prefix}php-sockets
 BuildRequires:  %{?scl_prefix}php-mysqli
 BuildRequires:  pcre-devel
 
-Requires(post): %{__pecl}
-Requires(postun): %{__pecl}
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 %if "%{php_version}" < "5.4"
@@ -181,12 +179,23 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
-%post
-%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+# Don't install/register tests
+sed -e 's/role="test"/role="src"/' -i package.xml
 
+# when pear installed alone, after us
+%triggerin -- %{?scl_prefix}php-pear
+if [ -x %{__pecl} ] ; then
+    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+fi
+
+# posttrans as pear can be installed after us
+%posttrans
+if [ -x %{__pecl} ] ; then
+    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+fi
 
 %postun
-if [ $1 -eq 0 ] ; then
+if [ $1 -eq 0 -a -x %{__pecl} ] ; then
     %{pecl_uninstall} %{pecl_name} >/dev/null || :
 fi
 
@@ -231,6 +240,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Feb 15 2015 Remi Collet <remi@fedoraproject.org> - 1.7.10-1
+- Update to 1.7.10
+- drop runtime dependency on pear, new scriptlets
+
 * Wed Jan 07 2015 Remi Collet <remi@fedoraproject.org> - 1.7.9-1
 - Update to 1.7.9