From 07504511032443ae5d6fa5740a87d60683fbf55d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 26 Apr 2023 17:34:50 +0200 Subject: update to 5.0.3 use system libnghttp2 drop patch merged upstream fix use of system headers with system libnghttp2 using patch from https://github.com/swoole/swoole-src/pull/5038 build out of sources tree --- swoole-syslib.patch | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 swoole-syslib.patch (limited to 'swoole-syslib.patch') diff --git a/swoole-syslib.patch b/swoole-syslib.patch new file mode 100644 index 0000000..0c58430 --- /dev/null +++ b/swoole-syslib.patch @@ -0,0 +1,35 @@ +From 27141691462ed49e42968d77192df62e89f72156 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Wed, 26 Apr 2023 17:17:43 +0200 +Subject: [PATCH] use system headers for system libnghttp2 + +--- + config.m4 | 1 + + ext-src/php_swoole_http.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/config.m4 b/config.m4 +index da62b9a704..19fb0698d3 100644 +--- a/config.m4 ++++ b/config.m4 +@@ -744,6 +744,7 @@ EOF + thirdparty/hiredis/sds.c" + + if test "$PHP_NGHTTP2_DIR" = "no"; then ++ PHP_ADD_INCLUDE([$ext_srcdir/thirdparty]) + swoole_source_file="$swoole_source_file \ + thirdparty/nghttp2/nghttp2_hd.c \ + thirdparty/nghttp2/nghttp2_rcbuf.c \ +diff --git a/ext-src/php_swoole_http.h b/ext-src/php_swoole_http.h +index b43982e5c6..717c2ee4d3 100644 +--- a/ext-src/php_swoole_http.h ++++ b/ext-src/php_swoole_http.h +@@ -34,7 +34,7 @@ + #define SW_ZLIB_ENCODING_ANY 0x2f + #endif + +-#include "thirdparty/nghttp2/nghttp2.h" ++#include + + enum swHttpHeaderFlag { + HTTP_HEADER_SERVER = 1u << 1, -- cgit