diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2021-12-12 20:56:47 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2021-12-12 20:56:47 +0300 |
commit | ae6071dcd2aa7e8eb2d4765e1633aa75eed89e0c (patch) | |
tree | 9252e4c997b23ec68074eed0a82ed08650b37f90 | |
parent | fdf0ea88acd3829766a7aec8ef7418dc535c2850 (diff) | |
download | libmicrohttpd-ae6071dcd2aa7e8eb2d4765e1633aa75eed89e0c.tar.gz libmicrohttpd-ae6071dcd2aa7e8eb2d4765e1633aa75eed89e0c.zip |
GnuTLS: correctly pass sockets on W32 x64
-rw-r--r-- | src/microhttpd/daemon.c | 2 | ||||
-rw-r--r-- | src/microhttpd/test_upgrade.c | 6 | ||||
-rw-r--r-- | src/microhttpd/test_upgrade_large.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index a75dd0c0..0c9ee2e8 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -2646,7 +2646,7 @@ new_connection_prepare_ (struct MHD_Daemon *daemon, | |||
2646 | #else /* GnuTLS before 3.1.9 or Win x64 */ | 2646 | #else /* GnuTLS before 3.1.9 or Win x64 */ |
2647 | gnutls_transport_set_ptr (connection->tls_session, | 2647 | gnutls_transport_set_ptr (connection->tls_session, |
2648 | (gnutls_transport_ptr_t) (intptr_t) (client_socket)); | 2648 | (gnutls_transport_ptr_t) (intptr_t) (client_socket)); |
2649 | #endif /* GnuTLS before 3.1.9 */ | 2649 | #endif /* GnuTLS before 3.1.9 or Win x64 */ |
2650 | #ifdef MHD_TLSLIB_NEED_PUSH_FUNC | 2650 | #ifdef MHD_TLSLIB_NEED_PUSH_FUNC |
2651 | gnutls_transport_set_push_function (connection->tls_session, | 2651 | gnutls_transport_set_push_function (connection->tls_session, |
2652 | MHD_tls_push_func_); | 2652 | MHD_tls_push_func_); |
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c index 111c6a79..950a5fb4 100644 --- a/src/microhttpd/test_upgrade.c +++ b/src/microhttpd/test_upgrade.c | |||
@@ -235,12 +235,12 @@ wr_create_tls_sckt (void) | |||
235 | GNUTLS_CRD_CERTIFICATE, | 235 | GNUTLS_CRD_CERTIFICATE, |
236 | s->tls_crd)) | 236 | s->tls_crd)) |
237 | { | 237 | { |
238 | #if GNUTLS_VERSION_NUMBER + 0 >= 0x030109 | 238 | #if (GNUTLS_VERSION_NUMBER + 0 >= 0x030109) && ! defined(_WIN64) |
239 | gnutls_transport_set_int (s->tls_s, (int) (s->fd)); | 239 | gnutls_transport_set_int (s->tls_s, (int) (s->fd)); |
240 | #else /* GnuTLS before 3.1.9 */ | 240 | #else /* GnuTLS before 3.1.9 or Win x64 */ |
241 | gnutls_transport_set_ptr (s->tls_s, | 241 | gnutls_transport_set_ptr (s->tls_s, |
242 | (gnutls_transport_ptr_t) (intptr_t) (s->fd)); | 242 | (gnutls_transport_ptr_t) (intptr_t) (s->fd)); |
243 | #endif /* GnuTLS before 3.1.9 */ | 243 | #endif /* GnuTLS before 3.1.9 or Win x64 */ |
244 | return s; | 244 | return s; |
245 | } | 245 | } |
246 | gnutls_certificate_free_credentials (s->tls_crd); | 246 | gnutls_certificate_free_credentials (s->tls_crd); |
diff --git a/src/microhttpd/test_upgrade_large.c b/src/microhttpd/test_upgrade_large.c index 3393a749..c321080e 100644 --- a/src/microhttpd/test_upgrade_large.c +++ b/src/microhttpd/test_upgrade_large.c | |||
@@ -400,12 +400,12 @@ wr_create_tls_sckt (void) | |||
400 | GNUTLS_CRD_CERTIFICATE, | 400 | GNUTLS_CRD_CERTIFICATE, |
401 | s->tls_crd)) | 401 | s->tls_crd)) |
402 | { | 402 | { |
403 | #if GNUTLS_VERSION_NUMBER + 0 >= 0x030109 | 403 | #if (GNUTLS_VERSION_NUMBER + 0 >= 0x030109) && ! defined(_WIN64) |
404 | gnutls_transport_set_int (s->tls_s, (int) (s->fd)); | 404 | gnutls_transport_set_int (s->tls_s, (int) (s->fd)); |
405 | #else /* GnuTLS before 3.1.9 */ | 405 | #else /* GnuTLS before 3.1.9 or Win x64 */ |
406 | gnutls_transport_set_ptr (s->tls_s, | 406 | gnutls_transport_set_ptr (s->tls_s, |
407 | (gnutls_transport_ptr_t) (intptr_t) (s->fd)); | 407 | (gnutls_transport_ptr_t) (intptr_t) (s->fd)); |
408 | #endif /* GnuTLS before 3.1.9 */ | 408 | #endif /* GnuTLS before 3.1.9 or Win x64 */ |
409 | return s; | 409 | return s; |
410 | } | 410 | } |
411 | gnutls_certificate_free_credentials (s->tls_crd); | 411 | gnutls_certificate_free_credentials (s->tls_crd); |