diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-10-17 09:30:23 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-10-17 09:30:23 +0000 |
| commit | 517a443636daa1e8085cb4e5325524a54e8a8fd7 (patch) | |
| tree | 5352109cc7cd5122274ab0cfc1f887b685f04edf /web/server/static | |
| parent | Releasing debian version 1.42.4-1. (diff) | |
| download | netdata-517a443636daa1e8085cb4e5325524a54e8a8fd7.tar.xz netdata-517a443636daa1e8085cb4e5325524a54e8a8fd7.zip | |
Merging upstream version 1.43.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'web/server/static')
| -rw-r--r-- | web/server/static/static-threaded.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/web/server/static/static-threaded.c b/web/server/static/static-threaded.c index b0e691163..60d80446e 100644 --- a/web/server/static/static-threaded.c +++ b/web/server/static/static-threaded.c @@ -242,7 +242,9 @@ static void *web_server_add_callback(POLLINFO *pi, short int *events, void *data netdata_log_debug(D_WEB_CLIENT, "%llu: ADDED CLIENT FD %d", w->id, pi->fd); +#ifdef ENABLE_HTTPS cleanup: +#endif worker_is_idle(); return w; } @@ -368,7 +370,7 @@ static int web_server_snd_callback(POLLINFO *pi, short int *events) { netdata_log_debug(D_WEB_CLIENT, "%llu: sending data on fd %d.", w->id, fd); - int ret = web_client_send(w); + ssize_t ret = web_client_send(w); if(unlikely(ret < 0)) { retval = -1; @@ -499,12 +501,12 @@ void *socket_listen_main_static_threaded(void *ptr) { if(!api_sockets.opened) fatal("LISTENER: no listen sockets available."); +#ifdef ENABLE_HTTPS netdata_ssl_validate_certificate = !config_get_boolean(CONFIG_SECTION_WEB, "ssl skip certificate verification", !netdata_ssl_validate_certificate); if(!netdata_ssl_validate_certificate_sender) netdata_log_info("SSL: web server will skip SSL certificates verification."); -#ifdef ENABLE_HTTPS netdata_ssl_initialize_ctx(NETDATA_SSL_WEB_SERVER_CTX); #endif |