moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Use always close as it is defined by gnulib on platforms lacking it.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2010-05-07 13:27:11 +02:00
parent 5a97871f5d
commit b76ef3f452
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,5 +1,11 @@
2010-05-07 Giuseppe Scrivano <gscrivano@gnu.org>
* gnutls.c (wgnutls_close): Use always `close', not `closesocket'.
* openssl.c (openssl_close): Use always `close', not `closesocket'.
(ssl_connect_wget): Get the real socket handle by FD_TO_SOCKET.
Define FD_TO_SOCKET if it is not yet defined.
* Makefile.am (libunittest_a_CPPFLAGS): Add -I$(top_builddir)/lib.
* mswindows.h: Always include <winsock2.h> and <ws2tcpip.h>. Do not

4
src/gnutls.c
View File

@ -165,11 +165,7 @@ wgnutls_close (int fd, void *arg)
/*gnutls_bye (ctx->session, GNUTLS_SHUT_RDWR);*/
gnutls_deinit (ctx->session);
xfree (ctx);
#ifndef WINDOWS
close (fd);
#else
closesocket (fd);
#endif
}
/* gnutls_transport is the singleton that describes the SSL transport

9
src/openssl.c
View File

@ -364,11 +364,7 @@ openssl_close (int fd, void *arg)
xfree_null (ctx->last_error);
xfree (ctx);
#if defined(WINDOWS) || defined(USE_WATT32)
closesocket (fd);
#else
close (fd);
#endif
DEBUGP (("Closed %d/SSL 0x%0*lx\n", fd, PTR_FORMAT (conn)));
}
@ -401,7 +397,10 @@ ssl_connect_wget (int fd)
conn = SSL_new (ssl_ctx);
if (!conn)
goto error;
if (!SSL_set_fd (conn, fd))
#ifndef FD_TO_SOCKET
# define FD_TO_SOCKET(x) (x)
#endif
if (!SSL_set_fd (conn, FD_TO_SOCKET (fd)))
goto error;
SSL_set_connect_state (conn);
if (SSL_connect (conn) <= 0 || conn->state != SSL_ST_OK)