c8-stream-20
imports/c8-stream-20/nodejs-20.16.0-1.module+el8.10.0+22203+a88c8310
MSVSphere Packaging Team
3 months ago
parent
3943f18980
commit
3fe5b7aabf
@ -1,6 +1,6 @@
|
|||||||
SOURCES/cjs-module-lexer-1.2.2.tar.gz
|
SOURCES/cjs-module-lexer-1.2.2.tar.gz
|
||||||
SOURCES/icu4c-74_2-src.tgz
|
SOURCES/icu4c-75_1-src.tgz
|
||||||
SOURCES/node-v20.12.2-stripped.tar.gz
|
SOURCES/node-v20.16.0-stripped.tar.gz
|
||||||
SOURCES/undici-5.28.4.tar.gz
|
SOURCES/undici-6.19.2.tar.gz
|
||||||
SOURCES/wasi-sdk-wasi-sdk-11.tar.gz
|
SOURCES/wasi-sdk-wasi-sdk-11.tar.gz
|
||||||
SOURCES/wasi-sdk-wasi-sdk-16.tar.gz
|
SOURCES/wasi-sdk-wasi-sdk-16.tar.gz
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
164f7f39841415284b0280a648c43bd7ea1615ac SOURCES/cjs-module-lexer-1.2.2.tar.gz
|
164f7f39841415284b0280a648c43bd7ea1615ac SOURCES/cjs-module-lexer-1.2.2.tar.gz
|
||||||
43a8d688a3a6bc8f0f8c5e699d0ef7a905d24314 SOURCES/icu4c-74_2-src.tgz
|
da3614aa496c5f0fde12f7aa155f235b5e239f1b SOURCES/icu4c-75_1-src.tgz
|
||||||
f25c352600b72849a7241017ffc64bb0fe339d4d SOURCES/node-v20.12.2-stripped.tar.gz
|
f5c3411098f91526d7ce14b14b080e368510ae93 SOURCES/node-v20.16.0-stripped.tar.gz
|
||||||
2be9cb115c2832e1fda9e730fa92e0bf725b6f3d SOURCES/undici-5.28.4.tar.gz
|
0653ac16ef498878fffefea0fa1f7e870cdfc249 SOURCES/undici-6.19.2.tar.gz
|
||||||
8979d177dd62e3b167a6fd7dc7185adb0128c439 SOURCES/wasi-sdk-wasi-sdk-11.tar.gz
|
8979d177dd62e3b167a6fd7dc7185adb0128c439 SOURCES/wasi-sdk-wasi-sdk-11.tar.gz
|
||||||
fbe01909bf0e8260fcc3696ec37c9f731b5e356a SOURCES/wasi-sdk-wasi-sdk-16.tar.gz
|
fbe01909bf0e8260fcc3696ec37c9f731b5e356a SOURCES/wasi-sdk-wasi-sdk-16.tar.gz
|
||||||
|
|||||||
@ -0,0 +1,57 @@
|
|||||||
|
gcc available in RHEL-8 does not know -mbranch-protection option and since
|
||||||
|
it was introduced for cross-compilation purposes in nodejs upstream, it seems
|
||||||
|
to be save to revert the upstream patch.
|
||||||
|
|
||||||
|
Revert "build: fix arm64 cross-compilation bug on non-arm machines"
|
||||||
|
This reverts upstream commit 6826bbf26755b144a478e51fd0a7dc83aa0c65b8.
|
||||||
|
|
||||||
|
Revert "build: fix arm64 cross-compilation"
|
||||||
|
This reverts upstream commit 297368a1edc48d2bedc58c75f1857276bdcdd578.
|
||||||
|
---
|
||||||
|
configure.py | 2 ++
|
||||||
|
node.gyp | 15 ---------------
|
||||||
|
2 files changed, 2 insertions(+), 15 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.py b/configure.py
|
||||||
|
index f189ba2bf09..9b2d993bb32 100755
|
||||||
|
--- a/configure.py
|
||||||
|
+++ b/configure.py
|
||||||
|
@@ -1344,7 +1344,9 @@ def configure_node(o):
|
||||||
|
|
||||||
|
o['variables']['want_separate_host_toolset'] = int(cross_compiling)
|
||||||
|
|
||||||
|
+ # Enable branch protection for arm64
|
||||||
|
if target_arch == 'arm64':
|
||||||
|
+ o['cflags']+=['-msign-return-address=all']
|
||||||
|
o['variables']['arm_fpu'] = options.arm_fpu or 'neon'
|
||||||
|
|
||||||
|
if options.node_snapshot_main is not None:
|
||||||
|
diff --git a/node.gyp b/node.gyp
|
||||||
|
index ff59af6ff76..7d9ec812917 100644
|
||||||
|
--- a/node.gyp
|
||||||
|
+++ b/node.gyp
|
||||||
|
@@ -468,21 +468,6 @@
|
||||||
|
},
|
||||||
|
|
||||||
|
'conditions': [
|
||||||
|
- # Pointer authentication for ARM64.
|
||||||
|
- ['target_arch=="arm64"', {
|
||||||
|
- 'target_conditions': [
|
||||||
|
- ['_toolset=="host"', {
|
||||||
|
- 'conditions': [
|
||||||
|
- ['host_arch=="arm64"', {
|
||||||
|
- 'cflags': ['-mbranch-protection=standard'],
|
||||||
|
- }],
|
||||||
|
- ],
|
||||||
|
- }],
|
||||||
|
- ['_toolset=="target"', {
|
||||||
|
- 'cflags': ['-mbranch-protection=standard'],
|
||||||
|
- }],
|
||||||
|
- ],
|
||||||
|
- }],
|
||||||
|
['OS in "aix os400"', {
|
||||||
|
'ldflags': [
|
||||||
|
'-Wl,-bnoerrmsg',
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
||||||
@ -1,107 +0,0 @@
|
|||||||
From d9a06fe94439d9f103aeffe597441c0a2c0a4eb3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
|
|
||||||
Date: Sat, 9 Mar 2024 16:26:42 +0900
|
|
||||||
Subject: [PATCH] Limit CONTINUATION frames following an incoming HEADER frame
|
|
||||||
|
|
||||||
Signed-off-by: rpm-build <rpm-build>
|
|
||||||
---
|
|
||||||
deps/nghttp2/lib/includes/nghttp2/nghttp2.h | 7 ++++++-
|
|
||||||
deps/nghttp2/lib/nghttp2_helper.c | 2 ++
|
|
||||||
deps/nghttp2/lib/nghttp2_session.c | 7 +++++++
|
|
||||||
deps/nghttp2/lib/nghttp2_session.h | 10 ++++++++++
|
|
||||||
4 files changed, 25 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
|
|
||||||
index 8891760..a9629c7 100644
|
|
||||||
--- a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
|
|
||||||
+++ b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
|
|
||||||
@@ -466,7 +466,12 @@ typedef enum {
|
|
||||||
* exhaustion on server side to send these frames forever and does
|
|
||||||
* not read network.
|
|
||||||
*/
|
|
||||||
- NGHTTP2_ERR_FLOODED = -904
|
|
||||||
+ NGHTTP2_ERR_FLOODED = -904,
|
|
||||||
+ /**
|
|
||||||
+ * When a local endpoint receives too many CONTINUATION frames
|
|
||||||
+ * following a HEADER frame.
|
|
||||||
+ */
|
|
||||||
+ NGHTTP2_ERR_TOO_MANY_CONTINUATIONS = -905,
|
|
||||||
} nghttp2_error;
|
|
||||||
|
|
||||||
/**
|
|
||||||
diff --git a/deps/nghttp2/lib/nghttp2_helper.c b/deps/nghttp2/lib/nghttp2_helper.c
|
|
||||||
index 93dd475..b3563d9 100644
|
|
||||||
--- a/deps/nghttp2/lib/nghttp2_helper.c
|
|
||||||
+++ b/deps/nghttp2/lib/nghttp2_helper.c
|
|
||||||
@@ -336,6 +336,8 @@ const char *nghttp2_strerror(int error_code) {
|
|
||||||
"closed";
|
|
||||||
case NGHTTP2_ERR_TOO_MANY_SETTINGS:
|
|
||||||
return "SETTINGS frame contained more than the maximum allowed entries";
|
|
||||||
+ case NGHTTP2_ERR_TOO_MANY_CONTINUATIONS:
|
|
||||||
+ return "Too many CONTINUATION frames following a HEADER frame";
|
|
||||||
default:
|
|
||||||
return "Unknown error code";
|
|
||||||
}
|
|
||||||
diff --git a/deps/nghttp2/lib/nghttp2_session.c b/deps/nghttp2/lib/nghttp2_session.c
|
|
||||||
index 226cdd5..e343365 100644
|
|
||||||
--- a/deps/nghttp2/lib/nghttp2_session.c
|
|
||||||
+++ b/deps/nghttp2/lib/nghttp2_session.c
|
|
||||||
@@ -497,6 +497,7 @@ static int session_new(nghttp2_session **session_ptr,
|
|
||||||
(*session_ptr)->max_send_header_block_length = NGHTTP2_MAX_HEADERSLEN;
|
|
||||||
(*session_ptr)->max_outbound_ack = NGHTTP2_DEFAULT_MAX_OBQ_FLOOD_ITEM;
|
|
||||||
(*session_ptr)->max_settings = NGHTTP2_DEFAULT_MAX_SETTINGS;
|
|
||||||
+ (*session_ptr)->max_continuations = NGHTTP2_DEFAULT_MAX_CONTINUATIONS;
|
|
||||||
|
|
||||||
if (option) {
|
|
||||||
if ((option->opt_set_mask & NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE) &&
|
|
||||||
@@ -6812,6 +6813,8 @@ nghttp2_ssize nghttp2_session_mem_recv2(nghttp2_session *session,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
session_inbound_frame_reset(session);
|
|
||||||
+
|
|
||||||
+ session->num_continuations = 0;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
@@ -6933,6 +6936,10 @@ nghttp2_ssize nghttp2_session_mem_recv2(nghttp2_session *session,
|
|
||||||
}
|
|
||||||
#endif /* DEBUGBUILD */
|
|
||||||
|
|
||||||
+ if (++session->num_continuations > session->max_continuations) {
|
|
||||||
+ return NGHTTP2_ERR_TOO_MANY_CONTINUATIONS;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
readlen = inbound_frame_buf_read(iframe, in, last);
|
|
||||||
in += readlen;
|
|
||||||
|
|
||||||
diff --git a/deps/nghttp2/lib/nghttp2_session.h b/deps/nghttp2/lib/nghttp2_session.h
|
|
||||||
index b119329..ef8f7b2 100644
|
|
||||||
--- a/deps/nghttp2/lib/nghttp2_session.h
|
|
||||||
+++ b/deps/nghttp2/lib/nghttp2_session.h
|
|
||||||
@@ -110,6 +110,10 @@ typedef struct {
|
|
||||||
#define NGHTTP2_DEFAULT_STREAM_RESET_BURST 1000
|
|
||||||
#define NGHTTP2_DEFAULT_STREAM_RESET_RATE 33
|
|
||||||
|
|
||||||
+/* The default max number of CONTINUATION frames following an incoming
|
|
||||||
+ HEADER frame. */
|
|
||||||
+#define NGHTTP2_DEFAULT_MAX_CONTINUATIONS 8
|
|
||||||
+
|
|
||||||
/* Internal state when receiving incoming frame */
|
|
||||||
typedef enum {
|
|
||||||
/* Receiving frame header */
|
|
||||||
@@ -290,6 +294,12 @@ struct nghttp2_session {
|
|
||||||
size_t max_send_header_block_length;
|
|
||||||
/* The maximum number of settings accepted per SETTINGS frame. */
|
|
||||||
size_t max_settings;
|
|
||||||
+ /* The maximum number of CONTINUATION frames following an incoming
|
|
||||||
+ HEADER frame. */
|
|
||||||
+ size_t max_continuations;
|
|
||||||
+ /* The number of CONTINUATION frames following an incoming HEADER
|
|
||||||
+ frame. This variable is reset when END_HEADERS flag is seen. */
|
|
||||||
+ size_t num_continuations;
|
|
||||||
/* Next Stream ID. Made unsigned int to detect >= (1 << 31). */
|
|
||||||
uint32_t next_stream_id;
|
|
||||||
/* The last stream ID this session initiated. For client session,
|
|
||||||
--
|
|
||||||
2.44.0
|
|
||||||
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
From ca0a0b02da4db1d65eca8169c6e27bb635924dfb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
|
|
||||||
Date: Sat, 9 Mar 2024 16:48:10 +0900
|
|
||||||
Subject: [PATCH] Add nghttp2_option_set_max_continuations
|
|
||||||
|
|
||||||
Signed-off-by: rpm-build <rpm-build>
|
|
||||||
---
|
|
||||||
deps/nghttp2/lib/includes/nghttp2/nghttp2.h | 11 +++++++++++
|
|
||||||
deps/nghttp2/lib/nghttp2_option.c | 5 +++++
|
|
||||||
deps/nghttp2/lib/nghttp2_option.h | 5 +++++
|
|
||||||
deps/nghttp2/lib/nghttp2_session.c | 4 ++++
|
|
||||||
4 files changed, 25 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
|
|
||||||
index a9629c7..92c3ccc 100644
|
|
||||||
--- a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
|
|
||||||
+++ b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
|
|
||||||
@@ -3210,6 +3210,17 @@ NGHTTP2_EXTERN void
|
|
||||||
nghttp2_option_set_stream_reset_rate_limit(nghttp2_option *option,
|
|
||||||
uint64_t burst, uint64_t rate);
|
|
||||||
|
|
||||||
+/**
|
|
||||||
+ * @function
|
|
||||||
+ *
|
|
||||||
+ * This function sets the maximum number of CONTINUATION frames
|
|
||||||
+ * following an incoming HEADER frame. If more than those frames are
|
|
||||||
+ * received, the remote endpoint is considered to be misbehaving and
|
|
||||||
+ * session will be closed. The default value is 8.
|
|
||||||
+ */
|
|
||||||
+NGHTTP2_EXTERN void nghttp2_option_set_max_continuations(nghttp2_option *option,
|
|
||||||
+ size_t val);
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
* @function
|
|
||||||
*
|
|
||||||
diff --git a/deps/nghttp2/lib/nghttp2_option.c b/deps/nghttp2/lib/nghttp2_option.c
|
|
||||||
index 43d4e95..53144b9 100644
|
|
||||||
--- a/deps/nghttp2/lib/nghttp2_option.c
|
|
||||||
+++ b/deps/nghttp2/lib/nghttp2_option.c
|
|
||||||
@@ -150,3 +150,8 @@ void nghttp2_option_set_stream_reset_rate_limit(nghttp2_option *option,
|
|
||||||
option->stream_reset_burst = burst;
|
|
||||||
option->stream_reset_rate = rate;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+void nghttp2_option_set_max_continuations(nghttp2_option *option, size_t val) {
|
|
||||||
+ option->opt_set_mask |= NGHTTP2_OPT_MAX_CONTINUATIONS;
|
|
||||||
+ option->max_continuations = val;
|
|
||||||
+}
|
|
||||||
diff --git a/deps/nghttp2/lib/nghttp2_option.h b/deps/nghttp2/lib/nghttp2_option.h
|
|
||||||
index 2259e18..c89cb97 100644
|
|
||||||
--- a/deps/nghttp2/lib/nghttp2_option.h
|
|
||||||
+++ b/deps/nghttp2/lib/nghttp2_option.h
|
|
||||||
@@ -71,6 +71,7 @@ typedef enum {
|
|
||||||
NGHTTP2_OPT_SERVER_FALLBACK_RFC7540_PRIORITIES = 1 << 13,
|
|
||||||
NGHTTP2_OPT_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION = 1 << 14,
|
|
||||||
NGHTTP2_OPT_STREAM_RESET_RATE_LIMIT = 1 << 15,
|
|
||||||
+ NGHTTP2_OPT_MAX_CONTINUATIONS = 1 << 16,
|
|
||||||
} nghttp2_option_flag;
|
|
||||||
|
|
||||||
/**
|
|
||||||
@@ -98,6 +99,10 @@ struct nghttp2_option {
|
|
||||||
* NGHTTP2_OPT_MAX_SETTINGS
|
|
||||||
*/
|
|
||||||
size_t max_settings;
|
|
||||||
+ /**
|
|
||||||
+ * NGHTTP2_OPT_MAX_CONTINUATIONS
|
|
||||||
+ */
|
|
||||||
+ size_t max_continuations;
|
|
||||||
/**
|
|
||||||
* Bitwise OR of nghttp2_option_flag to determine that which fields
|
|
||||||
* are specified.
|
|
||||||
diff --git a/deps/nghttp2/lib/nghttp2_session.c b/deps/nghttp2/lib/nghttp2_session.c
|
|
||||||
index e343365..555032d 100644
|
|
||||||
--- a/deps/nghttp2/lib/nghttp2_session.c
|
|
||||||
+++ b/deps/nghttp2/lib/nghttp2_session.c
|
|
||||||
@@ -586,6 +586,10 @@ static int session_new(nghttp2_session **session_ptr,
|
|
||||||
option->stream_reset_burst,
|
|
||||||
option->stream_reset_rate);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ if (option->opt_set_mask & NGHTTP2_OPT_MAX_CONTINUATIONS) {
|
|
||||||
+ (*session_ptr)->max_continuations = option->max_continuations;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
rv = nghttp2_hd_deflate_init2(&(*session_ptr)->hd_deflater,
|
|
||||||
--
|
|
||||||
2.44.0
|
|
||||||
|
|
||||||
Loading…
Reference in new issue