View Issue Details
ID | Project | Category | View Status | Date Submitted | Last Update |
---|---|---|---|---|---|
0005289 | libmicrohttpd | build system | public | 2018-02-24 18:16 | 2021-09-02 17:54 |
Reporter | v.balyasnyy | Assigned To | Christian Grothoff | ||
Priority | normal | Severity | minor | Reproducibility | always |
Status | closed | Resolution | fixed | ||
Platform | all | OS | all | OS Version | all |
Product Version | Git master | ||||
Target Version | 0.9.60 | Fixed in Version | 0.9.60 | ||
Summary | 0005289: build error with default configuration (without HTTPS_SUPPORT) | ||||
Description | Hello Build crashes on build with default configurations (without HTTPS_SUPPORT): error on build daemon_select.c and daemon_options.c sources, cannot find some fields in structs MHD_daemon and MHD_UpgradeResponseHandle, that is declare only on HTTPS_SUPPORT defined. best regards | ||||
Steps To Reproduce | configure and build default configuration | ||||
Tags | patch | ||||
Attached Files | libmicrohttpd_https_disable.patch (2,655 bytes)
diff --git a/src/lib/daemon_options.c b/src/lib/daemon_options.c index 991b989..e89fbc6 100644 --- a/src/lib/daemon_options.c +++ b/src/lib/daemon_options.c @@ -408,6 +408,9 @@ MHD_daemon_tls_key_and_cert_from_memory (struct MHD_Daemon *daemon, const char *mem_cert, const char *pass) { +#ifndef HTTPS_SUPPORT + return MHD_SC_TLS_DISABLED; +#else struct MHD_TLS_Plugin *plugin; if (NULL == (plugin = daemon->tls_api)) @@ -416,6 +419,7 @@ MHD_daemon_tls_key_and_cert_from_memory (struct MHD_Daemon *daemon, mem_key, mem_cert, pass); +#endif } @@ -432,12 +436,16 @@ enum MHD_StatusCode MHD_daemon_tls_mem_dhparams (struct MHD_Daemon *daemon, const char *dh) { +#ifndef HTTPS_SUPPORT + return MHD_SC_TLS_DISABLED; +#else struct MHD_TLS_Plugin *plugin; if (NULL == (plugin = daemon->tls_api)) return MHD_SC_TLS_BACKEND_UNINITIALIZED; return plugin->init_dhparams (plugin->cls, dh); +#endif } @@ -454,12 +462,16 @@ enum MHD_StatusCode MHD_daemon_tls_mem_trust (struct MHD_Daemon *daemon, const char *mem_trust) { +#ifndef HTTPS_SUPPORT + return MHD_SC_TLS_DISABLED; +#else struct MHD_TLS_Plugin *plugin; if (NULL == (plugin = daemon->tls_api)) return MHD_SC_TLS_BACKEND_UNINITIALIZED; return plugin->init_mem_trust (plugin->cls, mem_trust); +#endif } @@ -474,11 +486,15 @@ enum MHD_StatusCode MHD_daemon_gnutls_credentials (struct MHD_Daemon *daemon, int gnutls_credentials) { +#ifndef HTTPS_SUPPORT + return MHD_SC_TLS_DISABLED; +#else struct MHD_TLS_Plugin *plugin; if (NULL == (plugin = daemon->tls_api)) return MHD_SC_TLS_BACKEND_UNINITIALIZED; return MHD_SC_TLS_BACKEND_OPERATION_UNSUPPORTED; +#endif } @@ -503,11 +519,15 @@ enum MHD_StatusCode MHD_daemon_gnutls_key_and_cert_from_callback (struct MHD_Daemon *daemon, void *cb) { +#ifndef HTTPS_SUPPORT + return MHD_SC_TLS_DISABLED; +#else struct MHD_TLS_Plugin *plugin; if (NULL == (plugin = daemon->tls_api)) return MHD_SC_TLS_BACKEND_UNINITIALIZED; return MHD_SC_TLS_BACKEND_OPERATION_UNSUPPORTED; +#endif } diff --git a/src/lib/daemon_select.c b/src/lib/daemon_select.c index d2740b7..66ed5a8 100644 --- a/src/lib/daemon_select.c +++ b/src/lib/daemon_select.c @@ -350,6 +350,7 @@ MHD_daemon_get_fdset2 (struct MHD_Daemon *daemon, } +#ifdef HTTPS_SUPPORT /** * Update the @a urh based on the ready FDs in * the @a rs, @a ws, and @a es. @@ -391,6 +392,7 @@ urh_from_fdset (struct MHD_UpgradeResponseHandle *urh, urh->mhd.celi |= MHD_EPOLL_STATE_ERROR; } } +#endif /** | ||||
Date Modified | Username | Field | Change |
---|---|---|---|
2018-02-24 18:16 | v.balyasnyy | New Issue | |
2018-02-24 18:16 | v.balyasnyy | File Added: libmicrohttpd_https_disable.patch | |
2018-02-24 18:16 | v.balyasnyy | Tag Attached: patch | |
2018-02-28 22:23 | Christian Grothoff | Assigned To | => Christian Grothoff |
2018-02-28 22:23 | Christian Grothoff | Status | new => resolved |
2018-02-28 22:23 | Christian Grothoff | Resolution | open => fixed |
2018-02-28 22:23 | Christian Grothoff | Fixed in Version | => 0.9.60 |
2018-02-28 22:23 | Christian Grothoff | Note Added: 0012872 | |
2018-02-28 22:23 | Christian Grothoff | Product Version | => Git master |
2018-02-28 22:23 | Christian Grothoff | Target Version | => 0.9.60 |
2018-11-06 19:46 | Christian Grothoff | Status | resolved => closed |
2021-09-02 17:54 | Christian Grothoff | Changeset attached | => libmicrohttpd master c6a73b72 |
2021-09-02 17:54 | Christian Grothoff | Note Added: 0018181 |