diff options
author | Zoltán Fridrich <zfridric@redhat.com> | 2023-02-06 10:15:54 +0000 |
---|---|---|
committer | Zoltán Fridrich <zfridric@redhat.com> | 2023-02-06 10:15:54 +0000 |
commit | 5eddaf80bd6bd54e7cba46dc79e68ca297a196c7 (patch) | |
tree | b41368a2dd50ff80275b53f8daf3e8e576795627 | |
parent | 1dc85222fc8e08a3fc9e6c554f001a44baa61bd0 (diff) | |
parent | 4a065f3fddf1cf77a531a90aec85a41293b009d2 (diff) | |
download | gnutls-5eddaf80bd6bd54e7cba46dc79e68ca297a196c7.tar.gz |
Merge branch 'zfridric_devel2' into 'master'
Revert commit f7160e4f
Closes #1446
See merge request gnutls/gnutls!1695
-rw-r--r-- | src/socket.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/socket.c b/src/socket.c index 3a6993553e..953d63f767 100644 --- a/src/socket.c +++ b/src/socket.c @@ -613,7 +613,17 @@ socket_open2(socket_st * hd, const char *hostname, const char *service, (hd->session, wrap_pull_timeout_func); gnutls_transport_set_ptr(hd->session, hd); } else { +#ifdef _WIN32 + gnutls_transport_set_push_function(hd->session, + wrap_push); + gnutls_transport_set_pull_function(hd->session, + wrap_pull); + gnutls_transport_set_pull_timeout_function + (hd->session, wrap_pull_timeout_func); + gnutls_transport_set_ptr(hd->session, hd); +#else gnutls_transport_set_int(hd->session, hd->fd); +#endif } } |