diff options
Diffstat (limited to 'src/lib/daemon_options.c')
-rw-r--r-- | src/lib/daemon_options.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/lib/daemon_options.c b/src/lib/daemon_options.c index 640f70c8..4693b692 100644 --- a/src/lib/daemon_options.c +++ b/src/lib/daemon_options.c | |||
@@ -126,7 +126,7 @@ MHD_daemon_disallow_suspend_resume (struct MHD_Daemon *daemon) | |||
126 | void | 126 | void |
127 | MHD_daemon_disallow_upgrade (struct MHD_Daemon *daemon) | 127 | MHD_daemon_disallow_upgrade (struct MHD_Daemon *daemon) |
128 | { | 128 | { |
129 | daemon->disallow_upgrade; | 129 | daemon->disallow_upgrade = true; |
130 | } | 130 | } |
131 | 131 | ||
132 | 132 | ||
@@ -165,6 +165,7 @@ MHD_daemon_tcp_fastopen (struct MHD_Daemon *daemon, | |||
165 | return MHD_NO; | 165 | return MHD_NO; |
166 | #endif | 166 | #endif |
167 | } | 167 | } |
168 | return MHD_NO; | ||
168 | } | 169 | } |
169 | 170 | ||
170 | 171 | ||
@@ -355,20 +356,20 @@ MHD_daemon_set_tls_backend (struct MHD_Daemon *daemon, | |||
355 | if (NULL == | 356 | if (NULL == |
356 | (daemon->tls_backend_lib = dlopen (filename, | 357 | (daemon->tls_backend_lib = dlopen (filename, |
357 | RTLD_NOW | RTLD_LOCAL))) | 358 | RTLD_NOW | RTLD_LOCAL))) |
358 | return MHD_SC_BACKEND_UNSUPPORTED; /* plugin not found */ | 359 | return MHD_SC_TLS_BACKEND_UNSUPPORTED; /* plugin not found */ |
359 | if (NULL == (init = dlsym (daemon->tls_backend_lib, | 360 | if (NULL == (init = dlsym (daemon->tls_backend_lib, |
360 | "MHD_TLS_init_" MHD_TLS_ABI_VERSION_STR))) | 361 | "MHD_TLS_init_" MHD_TLS_ABI_VERSION_STR))) |
361 | 362 | ||
362 | { | 363 | { |
363 | dlclose (daemon->tls_backend_lib); | 364 | dlclose (daemon->tls_backend_lib); |
364 | daemon->tls_backend_lib = NULL; | 365 | daemon->tls_backend_lib = NULL; |
365 | return MHD_SC_BACKEND_UNSUPPORTED; /* possibly wrong version installed */ | 366 | return MHD_SC_TLS_BACKEND_UNSUPPORTED; /* possibly wrong version installed */ |
366 | } | 367 | } |
367 | if (NULL == (daemon->tls_api = init (ciphers))) | 368 | if (NULL == (daemon->tls_api = init (ciphers))) |
368 | { | 369 | { |
369 | dlclose (daemon->tls_backend_lib); | 370 | dlclose (daemon->tls_backend_lib); |
370 | daemon->tls_backend_lib = NULL; | 371 | daemon->tls_backend_lib = NULL; |
371 | return MHD_SC_CIPHERS_INVALID; /* possibly wrong version installed */ | 372 | return MHD_SC_TLS_CIPHERS_INVALID; /* possibly wrong version installed */ |
372 | } | 373 | } |
373 | return MHD_SC_OK; | 374 | return MHD_SC_OK; |
374 | #endif | 375 | #endif |
@@ -545,8 +546,8 @@ MHD_daemon_set_early_uri_logger (struct MHD_Daemon *daemon, | |||
545 | MHD_EarlyUriLogCallback cb, | 546 | MHD_EarlyUriLogCallback cb, |
546 | void *cb_cls) | 547 | void *cb_cls) |
547 | { | 548 | { |
548 | daemon->early_uri_logger = cb; | 549 | daemon->early_uri_logger_cb = cb; |
549 | daemon->early_uri_logger_cls = cb_cls; | 550 | daemon->early_uri_logger_cb_cls = cb_cls; |
550 | } | 551 | } |
551 | 552 | ||
552 | 553 | ||
@@ -687,6 +688,9 @@ MHD_daemon_digest_auth_random (struct MHD_Daemon *daemon, | |||
687 | daemon->digest_auth_random_buf = buf; | 688 | daemon->digest_auth_random_buf = buf; |
688 | daemon->digest_auth_random_buf_size = buf_size; | 689 | daemon->digest_auth_random_buf_size = buf_size; |
689 | #else | 690 | #else |
691 | (void) daemon; | ||
692 | (void) buf_size; | ||
693 | (void) buf; | ||
690 | MHD_PANIC ("digest authentication not supported by this build"); | 694 | MHD_PANIC ("digest authentication not supported by this build"); |
691 | #endif | 695 | #endif |
692 | } | 696 | } |
@@ -732,6 +736,8 @@ MHD_daemon_digest_auth_nc_length (struct MHD_Daemon *daemon, | |||
732 | daemon->digest_nc_length = nc_length; | 736 | daemon->digest_nc_length = nc_length; |
733 | return MHD_SC_OK; | 737 | return MHD_SC_OK; |
734 | #else | 738 | #else |
739 | (void) daemon; | ||
740 | (void) nc_length; | ||
735 | return MHD_SC_DIGEST_AUTH_NOT_SUPPORTED_BY_BUILD; | 741 | return MHD_SC_DIGEST_AUTH_NOT_SUPPORTED_BY_BUILD; |
736 | #endif | 742 | #endif |
737 | } | 743 | } |