nghttp2/nghttp2
1
0
Fork 0
mirror of https://github.com/nghttp2/nghttp2.git synced 2025-12-07 02:28:53 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2446 from nghttp2/app-cleanup

Browse Source 
App cleanup
This commit is contained in:
Tatsuhiro Tsujikawa
2025-05-31 10:47:00 +09:00
committed by GitHub
parent a4d961eb17 4ef64cab52
commit d159ff9baa
4 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app_helper.h
View File

@@ -34,7 +34,6 @@
#endif // HAVE_SYS_TIME_H #endif // HAVE_SYS_TIME_H
#include <poll.h> #include <poll.h>
#include <map>
#include <chrono> #include <chrono>
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

1
src/shrpx_config.h
View File

@@ -699,7 +699,6 @@ struct TLSConfig {
// list of supported SSL/TLS protocol strings. // list of supported SSL/TLS protocol strings.
std::vector<StringRef> tls_proto_list; std::vector<StringRef> tls_proto_list;
std::vector<uint8_t> sct_data; std::vector<uint8_t> sct_data;
BIO_METHOD *bio_method;
// Bit mask to disable SSL/TLS protocol versions. This will be // Bit mask to disable SSL/TLS protocol versions. This will be
// passed to SSL_CTX_set_options(). // passed to SSL_CTX_set_options().
nghttp2_ssl_op_type tls_proto_mask; nghttp2_ssl_op_type tls_proto_mask;

2
src/shrpx_worker.cc
View File

@@ -383,7 +383,7 @@ void Worker::replace_downstream_config(
std::unordered_map<StringRef, WeightGroup *> wgs; std::unordered_map<StringRef, WeightGroup *> wgs;
size_t num_wgs = 0; size_t num_wgs = 0;
for (auto &addr : shared_addr->addrs) { for (auto &addr : shared_addr->addrs) {
if (wgs.find(addr.group) == std::ranges::end(wgs)) { if (!wgs.contains(addr.group)) {
++num_wgs; ++num_wgs;
wgs.emplace(addr.group, nullptr); wgs.emplace(addr.group, nullptr);
} }

2
src/util.cc
View File

@@ -228,7 +228,7 @@ StringRef format_iso8601(char *out,
auto sys_info = zt.get_info(); auto sys_info = zt.get_info();
auto gmtoff = auto gmtoff =
std::chrono::duration_cast<std::chrono::minutes>(sys_info.offset).count(); std::chrono::floor<std::chrono::minutes>(sys_info.offset).count();
if (gmtoff == 0) { if (gmtoff == 0) {
*p++ = 'Z'; *p++ = 'Z';
} else { } else {