diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-11-30 18:47:05 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-11-30 18:47:05 +0000 |
| commit | 97e01009d69b8fbebfebf68f51e3d126d0ed43fc (patch) | |
| tree | 02e8b836c3a9d89806f3e67d4a5fe9f52dbb0061 /web/server/static | |
| parent | Releasing debian version 1.36.1-1. (diff) | |
| download | netdata-97e01009d69b8fbebfebf68f51e3d126d0ed43fc.tar.xz netdata-97e01009d69b8fbebfebf68f51e3d126d0ed43fc.zip | |
Merging upstream version 1.37.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 | 4 | ||||
| -rw-r--r-- | web/server/static/static-threaded.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/web/server/static/static-threaded.c b/web/server/static/static-threaded.c index 8b9122f87..26e9a47bd 100644 --- a/web/server/static/static-threaded.c +++ b/web/server/static/static-threaded.c @@ -196,7 +196,7 @@ static void *web_server_add_callback(POLLINFO *pi, short int *events, void *data } #ifdef ENABLE_HTTPS - if ((!web_client_check_unix(w)) && ( netdata_srv_ctx )) { + if ((!web_client_check_unix(w)) && (netdata_ssl_srv_ctx)) { if( sock_delnonblock(w->ifd) < 0 ){ error("Web server cannot remove the non-blocking flag from socket %d",w->ifd); } @@ -218,7 +218,7 @@ static void *web_server_add_callback(POLLINFO *pi, short int *events, void *data //The next two ifs are not together because I am reusing SSL structure if (!w->ssl.conn) { - w->ssl.conn = SSL_new(netdata_srv_ctx); + w->ssl.conn = SSL_new(netdata_ssl_srv_ctx); if ( w->ssl.conn ) { SSL_set_accept_state(w->ssl.conn); } else { diff --git a/web/server/static/static-threaded.h b/web/server/static/static-threaded.h index 5f4862e5b..a8c5335ef 100644 --- a/web/server/static/static-threaded.h +++ b/web/server/static/static-threaded.h @@ -5,6 +5,6 @@ #include "web/server/web_server.h" -extern void *socket_listen_main_static_threaded(void *ptr); +void *socket_listen_main_static_threaded(void *ptr); #endif //NETDATA_WEB_SERVER_STATIC_THREADED_H |