From d14d6a2f73636a08530d364e4d3a55b13922dcdf Mon Sep 17 00:00:00 2001
From: MARiA so cute <33935209+NathanFreeman@users.noreply.github.com>
Date: Fri, 23 Aug 2024 09:56:14 +0800
Subject: [PATCH] v5.1.4 (#5458)

---
 CMakeLists.txt           |  2 +-
 config.m4                | 10 ---------
 include/swoole_version.h |  2 +-
 package.xml              | 45 ++++++++++++++++++----------------------
 4 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a03f7f8d82..34c01d81667 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 PROJECT(libswoole)
 
 ENABLE_LANGUAGE(ASM)
-set(SWOOLE_VERSION 5.1.4-dev)
+set(SWOOLE_VERSION 5.1.4)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")
diff --git a/config.m4 b/config.m4
index 7587c57cceb..1c59606ec42 100644
--- a/config.m4
+++ b/config.m4
@@ -842,7 +842,6 @@ EOF
 	if test "$PHP_BROTLI" != "no" || test "$PHP_BROTLI_DIR" != "no"; then
         if test "$PHP_BROTLI_DIR" != "no"; then
             PHP_ADD_INCLUDE("${PHP_BROTLI_DIR}/include")
-            PHP_ADD_LIBRARY_WITH_PATH(brotli, "${PHP_BROTLI_DIR}/${PHP_LIBDIR}")
             PHP_ADD_LIBRARY_WITH_PATH(brotlienc, "${PHP_BROTLI_DIR}/${PHP_LIBDIR}")
             PHP_ADD_LIBRARY_WITH_PATH(brotlidec, "${PHP_BROTLI_DIR}/${PHP_LIBDIR}")
         else
@@ -977,15 +976,6 @@ EOF
         AC_DEFINE(SW_USE_OPENSSL, 1, [enable openssl support])
     fi
 
-    if test "$PHP_BROTLI_DIR" != "no"; then
-        AC_DEFINE(SW_HAVE_COMPRESSION, 1, [have compression])
-        AC_DEFINE(SW_HAVE_BROTLI, 1, [have brotli encoder])
-        PHP_ADD_INCLUDE("${PHP_BROTLI_DIR}/include")
-        PHP_ADD_LIBRARY_WITH_PATH(brotli, "${PHP_BROTLI_DIR}/${PHP_LIBDIR}")
-        PHP_ADD_LIBRARY_WITH_PATH(brotlienc, "${PHP_BROTLI_DIR}/${PHP_LIBDIR}")
-        PHP_ADD_LIBRARY_WITH_PATH(brotlidec, "${PHP_BROTLI_DIR}/${PHP_LIBDIR}")
-    fi
-
     if test "$PHP_NGHTTP2_DIR" != "no"; then
         PHP_ADD_INCLUDE("${PHP_NGHTTP2_DIR}/include")
         PHP_ADD_LIBRARY_WITH_PATH(nghttp2, "${PHP_NGHTTP2_DIR}/${PHP_LIBDIR}")
diff --git a/include/swoole_version.h b/include/swoole_version.h
index ddfce84379f..0d3f5dccd20 100644
--- a/include/swoole_version.h
+++ b/include/swoole_version.h
@@ -22,7 +22,7 @@
 #define SWOOLE_MINOR_VERSION 1
 #define SWOOLE_RELEASE_VERSION 4
 #define SWOOLE_EXTRA_VERSION ""
-#define SWOOLE_VERSION "5.1.4-dev"
+#define SWOOLE_VERSION "5.1.4"
 #define SWOOLE_VERSION_ID 50104
 #define SWOOLE_API_VERSION_ID 0x202208a
 
diff --git a/package.xml b/package.xml
index dd40b1e7ec0..ab07241349d 100644
--- a/package.xml
+++ b/package.xml
@@ -51,10 +51,10 @@
         <email>doubaokun@php.net</email>
         <active>yes</active>
     </developer>
-    <date>2024-05-24</date>
-    <time>21:00:00</time>
+    <date>2024-08-22</date>
+    <time>22:00:00</time>
     <version>
-        <release>5.1.3</release>
+        <release>5.1.4</release>
         <api>5.0</api>
     </version>
     <stability>
@@ -63,26 +63,11 @@
     </stability>
     <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
     <notes>
-        - Fix the problem of being unable to install through pecl.
-        - Fix the issue of Swoole\Coroutine\FastCGI\Client client being unable to set keepalive.
-        - Fix the issue of process continuously restarting due to error thrown when request parameters exceed max_input_vars.
-        - Fix the unknown issue caused by using Swoole\Event::wait() in a coroutine.
-        - Fix the issue of proc_open not supporting pty when used in a coroutine.
-        - Fix the segmentation fault issue in pdo_sqlite on PHP 8.3.
-        - Fix the unnecessary warning when compiling Swoole.
-        - Fix the error thrown when calling zend_fetch_resource2_ex on closed STDOUT/STDERR.
-        - Fix the invalid set_tcp_nodelay configuration.
-        - Fix the occasional unreachable branch issue triggered during file uploads.
-        - Fix the issue causing PHP core to throw errors when dispatch_func is set.
-        - Fix the obsolete warning of AC_PROG_CC_C99 in autoconf >= 2.70 version.
-        - Remove unnecessary checks for socket structs.
-        - Upgrade the Swoole library.
-        - Add support for http status code 451 in Swoole\Http\Response.
-        - Synchronize file operation code across different versions of PHP.
-        - Synchronize PDO operation code across different versions of PHP.
-        - Optimize the code for Socket::ssl_recv() function.
-        - Optimized config.m4 by allowing some configurations to set dependency library locations using pkg-config.
-        - Optimize the issue with using dynamic arrays when parsing request headers.
+        - Fix broken build with GCC 14. @remicollet
+        - Fix could not send SSL negotiation packet(Resource temporarily unavailable). @NathanFreeman
+        - Fix the issue where certain critical parameters of `Swoole\Server` are not reset to 0 during process restart. @NathanFreeman
+        - Fix the problem where `Swoole\Http\Request::getMethod()` returns the incorrect request method when `HTTP2` is enabled. @matyhtf
+        - Optimize `Swoole\Http\Response::end()`. Response data larger than 16K will be sent directly through the socket, while data smaller than or equal to 16K will be copied to the buffer first before being sent out via the socket. @NathanFreeman
     </notes>
     <contents>
         <dir name="/">
@@ -1316,6 +1301,7 @@
             <file role="test" name="tests/swoole_function/swoole_strerror.phpt" />
             <file role="test" name="tests/swoole_function/swoole_version.phpt" />
             <file role="test" name="tests/swoole_global/channel_construct_check.phpt" />
+            <file role="test" name="tests/swoole_global/closed_stdout.phpt" />
             <file role="test" name="tests/swoole_global/create_deny.phpt" />
             <file role="test" name="tests/swoole_global/function_alias.phpt" />
             <file role="test" name="tests/swoole_global/serialize_deny.phpt" />
@@ -1349,6 +1335,7 @@
             <file role="test" name="tests/swoole_http2_server/big_data.phpt" />
             <file role="test" name="tests/swoole_http2_server/compression.phpt" />
             <file role="test" name="tests/swoole_http2_server/compression_types.phpt" />
+            <file role="test" name="tests/swoole_http2_server/getMethod.phpt" />
             <file role="test" name="tests/swoole_http2_server/goaway.phpt" />
             <file role="test" name="tests/swoole_http2_server/http2_headers.phpt" />
             <file role="test" name="tests/swoole_http2_server/issue_4365.phpt" />
@@ -2537,8 +2524,16 @@
             <file role="src" name="thirdparty/php81/pdo_sqlite/sqlite_driver.stub.php" />
             <file role="src" name="thirdparty/php81/pdo_sqlite/sqlite_driver_arginfo.h" />
             <file role="src" name="thirdparty/php81/pdo_sqlite/sqlite_statement.c" />
-            <file role="src" name="thirdparty/php83/Zend/zend_call_stack.cc" />
-            <file role="src" name="thirdparty/php83/Zend/zend_call_stack.h" />
+            <file role="src" name="thirdparty/php83/pdo_oci/oci_driver.c" />
+            <file role="src" name="thirdparty/php83/pdo_oci/oci_statement.c" />
+            <file role="src" name="thirdparty/php83/pdo_oci/php_pdo_oci_int.h" />
+            <file role="src" name="thirdparty/php83/pdo_odbc/odbc_driver.c" />
+            <file role="src" name="thirdparty/php83/pdo_odbc/odbc_stmt.c" />
+            <file role="src" name="thirdparty/php83/pdo_odbc/php_pdo_odbc_int.h" />
+            <file role="src" name="thirdparty/php83/pdo_pgsql/pgsql_driver.c" />
+            <file role="src" name="thirdparty/php83/pdo_pgsql/pgsql_driver_arginfo.h" />
+            <file role="src" name="thirdparty/php83/pdo_pgsql/pgsql_statement.c" />
+            <file role="src" name="thirdparty/php83/pdo_pgsql/php_pdo_pgsql_int.h" />
             <file role="src" name="thirdparty/php83/pdo_sqlite/php_pdo_sqlite_int.h" />
             <file role="src" name="thirdparty/php83/pdo_sqlite/sqlite_driver.c" />
             <file role="src" name="thirdparty/php83/pdo_sqlite/sqlite_driver.stub.php" />