From 9f21603d0af1b64dc548f01e738907bb9134ca13 Mon Sep 17 00:00:00 2001 From: hzdrro Date: Mon, 15 May 2023 08:10:48 +0800 Subject: [PATCH] fix ws early data compatibility (#585) --- fmt/Bean2CoreObj_box.cpp | 6 +----- fmt/Bean2CoreObj_ray.cpp | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/fmt/Bean2CoreObj_box.cpp b/fmt/Bean2CoreObj_box.cpp index 213e001..cab8105 100644 --- a/fmt/Bean2CoreObj_box.cpp +++ b/fmt/Bean2CoreObj_box.cpp @@ -21,11 +21,7 @@ namespace NekoRay::fmt { } if (ws_early_data_length > 0) { transport["max_early_data"] = ws_early_data_length; - if (ws_early_data_name.isEmpty()) { - transport["early_data_header_name"] = "Sec-WebSocket-Protocol"; - } else { - transport["early_data_header_name"] = ws_early_data_name; - } + transport["early_data_header_name"] = ws_early_data_name; } } else if (network == "http") { if (!path.isEmpty()) transport["path"] = path; diff --git a/fmt/Bean2CoreObj_ray.cpp b/fmt/Bean2CoreObj_ray.cpp index c971154..19ddb40 100644 --- a/fmt/Bean2CoreObj_ray.cpp +++ b/fmt/Bean2CoreObj_ray.cpp @@ -26,11 +26,7 @@ namespace NekoRay::fmt { } if (ws_early_data_length > 0) { ws["maxEarlyData"] = ws_early_data_length; - if (ws_early_data_name.isEmpty()) { - ws["earlyDataHeaderName"] = "Sec-WebSocket-Protocol"; - } else { - ws["earlyDataHeaderName"] = ws_early_data_name; - } + ws["earlyDataHeaderName"] = ws_early_data_name; } streamSettings["wsSettings"] = ws; } else if (network == "http") {