update to 6.0.0 GAHEADmaster

enable zstd support
re-license spec file to CECILL-2.1
drop patch merged upstream
fix cpu affinity check using patch from
  https://github.com/swoole/swoole-src/pull/5624
update to 6.0.0 GA
enable zstd support
re-license spec file to CECILL-2.1
drop patch merged upstream
fix cpu affinity check using patch from
  https://github.com/swoole/swoole-src/pull/5624

1 files changed, 31 insertions, 27 deletions

diff --git a/REFLECTION b/REFLECTION
index b57f1d6..6d6fa47 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
+Extension [ <persistent> extension #129 swoole version 6.0.0 ] {
 
   - Dependencies {
     Dependency [ json (Required) ]
@@ -29,8 +29,8 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
     }
   }
 
-  - Constants [399] {
-    Constant [ string SWOOLE_VERSION ] { 6.0.0RC1 }
+  - Constants [400] {
+    Constant [ string SWOOLE_VERSION ] { 6.0.0 }
     Constant [ int SWOOLE_VERSION_ID ] { 60000 }
     Constant [ int SWOOLE_MAJOR_VERSION ] { 6 }
     Constant [ int SWOOLE_MINOR_VERSION ] { 0 }
@@ -136,6 +136,7 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
     Constant [ int SWOOLE_ERROR_SSL_BAD_PROTOCOL ] { 1016 }
     Constant [ int SWOOLE_ERROR_SSL_RESET ] { 1017 }
     Constant [ int SWOOLE_ERROR_SSL_HANDSHAKE_FAILED ] { 1018 }
+    Constant [ int SWOOLE_ERROR_SSL_CREATE_CONTEXT_FAILED ] { 1019 }
     Constant [ int SWOOLE_ERROR_PACKAGE_LENGTH_TOO_LARGE ] { 1201 }
     Constant [ int SWOOLE_ERROR_PACKAGE_LENGTH_NOT_FOUND ] { 1202 }
     Constant [ int SWOOLE_ERROR_DATA_LENGTH_TOO_LARGE ] { 1203 }
@@ -1826,9 +1827,13 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
       - Static methods [0] {
       }
 
-      - Properties [2] {
+      - Properties [6] {
         Property [ public $master_pid = -1 ]
+        Property [ public $workerPid = -1 ]
+        Property [ public $workerId = -1 ]
         Property [ public $workers = NULL ]
+        Property [ public $workerRunning = true ]
+        Property [ public $running = true ]
       }
 
       - Methods [12] {
@@ -2299,7 +2304,7 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
           - Parameters [1] {
             Parameter #0 [ <optional> int $flags = SORT_REGULAR ]
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayIterator> public method ksort ] {
@@ -2307,7 +2312,7 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
           - Parameters [1] {
             Parameter #0 [ <optional> int $flags = SORT_REGULAR ]
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayIterator> public method uasort ] {
@@ -2315,7 +2320,7 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
           - Parameters [1] {
             Parameter #0 [ <required> callable $callback ]
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayIterator> public method uksort ] {
@@ -2323,21 +2328,21 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
           - Parameters [1] {
             Parameter #0 [ <required> callable $callback ]
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayIterator> public method natsort ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayIterator> public method natcasesort ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayIterator, prototype Serializable> public method unserialize ] {
@@ -2725,7 +2730,7 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
             Parameter #0 [ <required> array|int $signals ]
             Parameter #1 [ <optional> float $timeout = -1 ]
           }
-          - Return [ bool ]
+          - Return [ int|false ]
         }
 
         Method [ <internal:swoole> static public method waitEvent ] {
@@ -2846,7 +2851,7 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
           - Parameters [1] {
             Parameter #0 [ <optional> int $flags = SORT_REGULAR ]
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayIterator> public method ksort ] {
@@ -2854,7 +2859,7 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
           - Parameters [1] {
             Parameter #0 [ <optional> int $flags = SORT_REGULAR ]
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayIterator> public method uasort ] {
@@ -2862,7 +2867,7 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
           - Parameters [1] {
             Parameter #0 [ <required> callable $callback ]
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayIterator> public method uksort ] {
@@ -2870,21 +2875,21 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
           - Parameters [1] {
             Parameter #0 [ <required> callable $callback ]
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayIterator> public method natsort ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayIterator> public method natcasesort ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayIterator, prototype Serializable> public method unserialize ] {
@@ -3070,7 +3075,7 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
           - Parameters [1] {
             Parameter #0 [ <optional> int $flags = SORT_REGULAR ]
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayObject> public method ksort ] {
@@ -3078,7 +3083,7 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
           - Parameters [1] {
             Parameter #0 [ <optional> int $flags = SORT_REGULAR ]
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayObject> public method uasort ] {
@@ -3086,7 +3091,7 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
           - Parameters [1] {
             Parameter #0 [ <required> callable $callback ]
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayObject> public method uksort ] {
@@ -3094,21 +3099,21 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
           - Parameters [1] {
             Parameter #0 [ <required> callable $callback ]
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayObject> public method natsort ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayObject> public method natcasesort ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ bool ]
+          - Tentative return [ true ]
         }
 
         Method [ <internal:SPL, inherits ArrayObject, prototype Serializable> public method unserialize ] {
@@ -3397,7 +3402,7 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
             Parameter #0 [ <required> array|int $signals ]
             Parameter #1 [ <optional> float $timeout = -1 ]
           }
-          - Return [ bool ]
+          - Return [ int|false ]
         }
 
         Method [ <internal:swoole> static public method waitEvent ] {
@@ -3565,9 +3570,8 @@ Extension [ <persistent> extension #126 swoole version 6.0.0RC1 ] {
       - Static methods [3] {
         Method [ <internal:swoole> static public method enableCoroutine ] {
 
-          - Parameters [2] {
-            Parameter #0 [ <optional> int|bool $enable = SWOOLE_HOOK_ALL ]
-            Parameter #1 [ <optional> int $flags = SWOOLE_HOOK_ALL ]
+          - Parameters [1] {
+            Parameter #0 [ <optional> int $flags = SWOOLE_HOOK_ALL ]
           }
           - Return [ bool ]
         }