libmicrohttpd2

commit 9fdc01cd6801849b5d6876834826db52c8aac113
parent e02e1f9c2af2adf993dd3c69ff7eedef0e1d42fe
Author: Evgeny Grin (Karlson2k) <k2k@drgrin.dev>
Date:   Sat, 26 Apr 2025 18:44:39 +0200

Fixed builds with TLS disabled

Diffstat:
M
src/mhd2/daemon_add_conn.c
 | 
2
++
M
src/mhd2/daemon_start.c
 | 
6
++++--
M
src/mhd2/lib_get_info.c
 | 
6
+++---
M
src/mhd2/mhd_lib_init.c
 | 
10
+++++++++-

4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/mhd2/daemon_add_conn.c b/src/mhd2/daemon_add_conn.c
@@ -273,6 +273,7 @@ new_connection_prepare_ (struct MHD_Daemon *restrict daemon,
       c->connection_timeout_ms = daemon->conns.cfg.timeout;
       c->event_loop_info = MHD_EVENT_LOOP_INFO_RECV;
 
+#ifdef MHD_SUPPORT_HTTPS
       if (0 != tls_data_size)
       {
         if (! mhd_tls_conn_init (daemon->tls,
@@ -293,6 +294,7 @@ new_connection_prepare_ (struct MHD_Daemon *restrict daemon,
 #endif
         }
       }
+#endif /* MHD_SUPPORT_HTTPS */
 
       if (MHD_SC_OK == ret)
       {
diff --git a/src/mhd2/daemon_start.c b/src/mhd2/daemon_start.c
@@ -1546,7 +1546,7 @@ static MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_NONNULL_ (2) \
 daemon_init_auth_digest (struct MHD_Daemon *restrict d,
                          struct DaemonOptions *restrict s)
 {
-  mhd_StatusCodeInt ret;
+  enum MHD_StatusCode ret;
   size_t nonces_num;
 
   if (0 == s->random_entropy.v_buf_size)
@@ -1609,7 +1609,7 @@ daemon_init_auth_digest (struct MHD_Daemon *restrict d,
 
   free (d->auth_dg.nonces);
   mhd_assert (MHD_SC_OK != ret);
-  return (enum MHD_StatusCode) ret; /* Failure exit point */
+  return ret; /* Failure exit point */
 }
 
 
@@ -1650,7 +1650,9 @@ static MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_NONNULL_ (2) \
 daemon_init_tls (struct MHD_Daemon *restrict d,
                  struct DaemonOptions *restrict s)
 {
+#ifdef MHD_SUPPORT_HTTPS
   mhd_StatusCodeInt ret;
+#endif /* MHD_SUPPORT_HTTPS */
 
   mhd_assert (! d->dbg.tls_inited);
 #ifdef MHD_SUPPORT_HTTPS
diff --git a/src/mhd2/lib_get_info.c b/src/mhd2/lib_get_info.c
@@ -436,9 +436,9 @@ MHD_lib_get_info_fixed_sz (enum MHD_LibInfoFixed info_type,
     if (sizeof(output_buf->v_tls_backends) <= output_buf_size)
     {
 #ifndef MHD_SUPPORT_HTTPS
-      output_buf->v_tls.tls_supported = MHD_NO;
-      output_buf->v_tls.backend_gnutls = MHD_NO;
-      output_buf->v_tls.backend_openssl = MHD_NO;
+      output_buf->v_tls_backends.tls_supported = MHD_NO;
+      output_buf->v_tls_backends.backend_gnutls = MHD_NO;
+      output_buf->v_tls_backends.backend_openssl = MHD_NO;
 #else
       output_buf->v_tls_backends.tls_supported = MHD_YES;
 #  ifdef MHD_SUPPORT_GNUTLS
diff --git a/src/mhd2/mhd_lib_init.c b/src/mhd2/mhd_lib_init.c
@@ -46,7 +46,9 @@
 
 #include "mhd_mono_clock.h"
 #include "mhd_send.h"
-#include "mhd_tls_funcs.h"
+#ifdef MHD_SUPPORT_HTTPS
+#  include "mhd_tls_funcs.h"
+#endif
 
 #include "mhd_lib_init.h"
 #include "mhd_lib_init_auto.h"
@@ -354,7 +356,9 @@ mhd_lib_global_full_init_once (void)
     return false;
   mhd_mclock_init_once ();
   mhd_send_init_once ();
+#ifdef MHD_SUPPORT_HTTPS
   mhd_tls_global_init_once ();
+#endif /* MHD_SUPPORT_HTTPS */
 
   mhd_lib_fully_inited_once = true;
 
@@ -369,7 +373,9 @@ mhd_lib_global_full_init_once (void)
 static void
 mhd_lib_global_full_deinit (void)
 {
+#ifdef MHD_SUPPORT_HTTPS
   mhd_tls_global_deinit ();
+#endif /* MHD_SUPPORT_HTTPS */
   mhd_mclock_deinit ();
   mhd_lib_sockets_deinit_w32 ();
 }
@@ -389,7 +395,9 @@ mhd_lib_global_full_re_init (void)
   if (! mhd_lib_sockets_init_w32 ())
     return false;
   mhd_mclock_re_init ();
+#ifdef MHD_SUPPORT_HTTPS
   mhd_tls_global_re_init ();
+#endif /* MHD_SUPPORT_HTTPS */
 
   return true;
 }