mirrors/libmicrohttpd
2
0
Fork 0
mirror of https://git.gnunet.org/libmicrohttpd.git synced 2026-09-25 04:09:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

daemon: merged processing of two similar options

Browse Source
This commit is contained in:
Evgeny Grin (Karlson2k)
2022-10-13 09:07:03 +03:00
parent f8502a2e07
commit 1689be3a27
1 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microhttpd/daemon.c
+26 -34
View File
@@ -6416,36 +6416,6 @@ parse_options_va (struct MHD_Daemon *daemon,
#endif
break;
case MHD_OPTION_HTTPS_PRIORITIES:
pstr = va_arg (ap,
const char *);
if (0 != (daemon->options & MHD_USE_TLS))
{
int init_res;
if (NULL != daemon->priority_cache)
gnutls_priority_deinit (daemon->priority_cache);
init_res = gnutls_priority_init (&daemon->priority_cache,
pstr,
NULL);
if (GNUTLS_E_SUCCESS != init_res)
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
_ ("Setting priorities to `%s' failed: %s\n"),
pstr,
gnutls_strerror (init_res));
#endif
daemon->priority_cache = NULL;
return MHD_NO;
}
}
#ifdef HAVE_MESSAGES
else
MHD_DLOG (daemon,
_ ("MHD HTTPS option %d passed to MHD but " \
"MHD_USE_TLS not set.\n"),
opt);
#endif
break;
case MHD_OPTION_HTTPS_PRIORITIES_APPEND:
pstr = va_arg (ap,
const char *);
@@ -6453,10 +6423,32 @@ parse_options_va (struct MHD_Daemon *daemon,
{
if (NULL != daemon->priority_cache)
gnutls_priority_deinit (daemon->priority_cache);
daemon->priority_cache = NULL;
/* The next function log error messages if needed */
if (! daemon_tls_priorities_init_append (daemon, pstr))
return MHD_NO;
if (MHD_OPTION_HTTPS_PRIORITIES == opt)
{
int init_res;
init_res = gnutls_priority_init (&daemon->priority_cache,
pstr,
NULL);
if (GNUTLS_E_SUCCESS != init_res)
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
_ ("Setting priorities to `%s' failed: %s\n"),
pstr,
gnutls_strerror (init_res));
#endif
daemon->priority_cache = NULL;
return MHD_NO;
}
}
else
{
/* The cache has been deinited */
daemon->priority_cache = NULL;
if (! daemon_tls_priorities_init_append (daemon, pstr))
return MHD_NO;
}
}
#ifdef HAVE_MESSAGES
else