From ebf8a9901c7556e7fdae2c8d7bae798a2f1f8478 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 14 Apr 2015 08:51:29 +0200
Subject: php-pecl-swoole: 1.7.15

---
 REFLECTION           | 88 ++++++++++++++++++++++++++++++++++++++++------------
 php-pecl-swoole.spec |  9 +++++-
 2 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/REFLECTION b/REFLECTION
index cc054ba..876fc53 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #153 swoole version 1.7.14 ] {
+Extension [ <persistent> extension #153 swoole version 1.7.15 ] {
 
   - INI {
     Entry [ swoole.aio_thread_num <ALL> ]
@@ -15,7 +15,7 @@ Extension [ <persistent> extension #153 swoole version 1.7.14 ] {
     }
   }
 
-  - Constants [45] {
+  - Constants [44] {
     Constant [ integer SWOOLE_BASE ] { 4 }
     Constant [ integer SWOOLE_THREAD ] { 2 }
     Constant [ integer SWOOLE_PROCESS ] { 3 }
@@ -45,17 +45,16 @@ Extension [ <persistent> extension #153 swoole version 1.7.14 ] {
     Constant [ integer SWOOLE_SYNC ] { 2048 }
     Constant [ integer SWOOLE_ASYNC ] { 1024 }
     Constant [ integer SWOOLE_KEEP ] { 512 }
-    Constant [ integer SWOOLE_SSL ] { 512 }
     Constant [ integer SWOOLE_EVENT_READ ] { 512 }
     Constant [ integer SWOOLE_EVENT_WRITE ] { 1024 }
-    Constant [ string SWOOLE_VERSION ] { 1.7.14 }
+    Constant [ string SWOOLE_VERSION ] { 1.7.15 }
     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 HTTP_GLOBAL_ALL ] { 126 }
     Constant [ integer WEBSOCKET_OPCODE_TEXT ] { 1 }
     Constant [ integer WEBSOCKET_OPCODE_BINARY ] { 2 }
     Constant [ integer WEBSOCKET_STATUS_CONNECTION ] { 1 }
@@ -299,7 +298,7 @@ Extension [ <persistent> extension #153 swoole version 1.7.14 ] {
       - Properties [0] {
       }
 
-      - Methods [29] {
+      - Methods [30] {
         Method [ <internal:swoole, ctor> public method __construct ] {
 
           - Parameters [4] {
@@ -341,6 +340,14 @@ Extension [ <persistent> extension #153 swoole version 1.7.14 ] {
           }
         }
 
+        Method [ <internal:swoole> public method sendwait ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $conn_fd ]
+            Parameter #1 [ <required> $send_data ]
+          }
+        }
+
         Method [ <internal:swoole> public method sendfile ] {
 
           - Parameters [2] {
@@ -702,7 +709,7 @@ Extension [ <persistent> extension #153 swoole version 1.7.14 ] {
       - Properties [0] {
       }
 
-      - Methods [14] {
+      - Methods [16] {
         Method [ <internal:swoole, ctor> public method __construct ] {
 
           - Parameters [1] {
@@ -754,6 +761,24 @@ Extension [ <persistent> extension #153 swoole version 1.7.14 ] {
           }
         }
 
+        Method [ <internal:swoole> public method incr ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> $key ]
+            Parameter #1 [ <required> $column ]
+            Parameter #2 [ <optional> $incrby ]
+          }
+        }
+
+        Method [ <internal:swoole> public method decr ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> $key ]
+            Parameter #1 [ <required> $column ]
+            Parameter #2 [ <optional> $decrby ]
+          }
+        }
+
         Method [ <internal:swoole> public method lock ] {
 
           - Parameters [0] {
@@ -813,7 +838,7 @@ Extension [ <persistent> extension #153 swoole version 1.7.14 ] {
         Property [ <default> private $global ]
       }
 
-      - Methods [30] {
+      - Methods [31] {
         Method [ <internal:swoole, overwrites swoole_server, prototype swoole_server> public method on ] {
 
           - Parameters [2] {
@@ -863,6 +888,14 @@ Extension [ <persistent> extension #153 swoole version 1.7.14 ] {
           }
         }
 
+        Method [ <internal:swoole, inherits swoole_server> public method sendwait ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $conn_fd ]
+            Parameter #1 [ <required> $send_data ]
+          }
+        }
+
         Method [ <internal:swoole, inherits swoole_server> public method sendfile ] {
 
           - Parameters [2] {
@@ -1078,16 +1111,32 @@ Extension [ <persistent> extension #153 swoole version 1.7.14 ] {
       - Properties [0] {
       }
 
-      - Methods [31] {
+      - Methods [32] {
         Method [ <internal:swoole, overwrites swoole_http_server, prototype swoole_server> public method on ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $ha_name ]
-            Parameter #1 [ <required> $cb ]
+            Parameter #0 [ <required> $event_name ]
+            Parameter #1 [ <required> $callback ]
           }
         }
 
         Method [ <internal:swoole> public method push ] {
+
+          - Parameters [4] {
+            Parameter #0 [ <required> $fd ]
+            Parameter #1 [ <required> $data ]
+            Parameter #2 [ <optional> $opcode ]
+            Parameter #3 [ <optional> $finish ]
+          }
+        }
+
+        Method [ <internal:swoole, overwrites swoole_server, prototype swoole_server> public method send ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> $fd ]
+            Parameter #1 [ <required> $data ]
+            Parameter #2 [ <optional> $from_id ]
+          }
         }
 
         Method [ <internal:swoole, inherits swoole_http_server> public method setglobal ] {
@@ -1113,15 +1162,6 @@ Extension [ <persistent> extension #153 swoole version 1.7.14 ] {
           }
         }
 
-        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] {
@@ -1131,6 +1171,14 @@ Extension [ <persistent> extension #153 swoole version 1.7.14 ] {
           }
         }
 
+        Method [ <internal:swoole, inherits swoole_server> public method sendwait ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $conn_fd ]
+            Parameter #1 [ <required> $send_data ]
+          }
+        }
+
         Method [ <internal:swoole, inherits swoole_server> public method sendfile ] {
 
           - Parameters [2] {
diff --git a/php-pecl-swoole.spec b/php-pecl-swoole.spec
index 96d30e3..6196f80 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.14
+Version:        1.7.15
 Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        BSD
 Group:          Development/Languages
@@ -67,6 +67,10 @@ Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
 %endif
+%if "%{php_version}" > "7.0"
+Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
+%endif
 %endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -241,6 +245,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 14 2015 Remi Collet <remi@fedoraproject.org> - 1.7.15-1
+- Update to 1.7.15
+
 * Thu Mar 26 2015 Remi Collet <remi@fedoraproject.org> - 1.7.14-1
 - Update to 1.7.14
 
-- 
cgit