summaryrefslogtreecommitdiffstats
path: root/crypto/bio/b_sock.c
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2007-09-16 18:35:02 +0000
committerAndy Polyakov <appro@openssl.org>2007-09-16 18:35:02 +0000
commitcc3d7bd0fc1eda332ccba7423a45f5cb15aa7069 (patch)
tree0b912aa73d4f49d4078184030906ff531c43927d /crypto/bio/b_sock.c
parent7df4c86bdd99dc6a6ef7190ae1090e32ba9f9c35 (diff)
It's inappropraite to override application signal, nor is it appropriate
to shut down Winsock unless we know it won't be used [and we never do]. PR: 1439
Diffstat (limited to 'crypto/bio/b_sock.c')
-rw-r--r--crypto/bio/b_sock.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index c8ca5923c1..e4c7ee1277 100644
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -463,9 +463,6 @@ int BIO_sock_init(void)
{
int err;
-#ifdef SIGINT
- signal(SIGINT,(void (*)(int))BIO_sock_cleanup);
-#endif
wsa_init_done=1;
memset(&wsa_state,0,sizeof(wsa_state));
/* Not making wsa_state available to the rest of the
@@ -496,11 +493,6 @@ int BIO_sock_init(void)
if (!wsa_init_done)
{
-
-# ifdef SIGINT
- signal(SIGINT,(void (*)(int))BIO_sock_cleanup);
-# endif
-
wsa_init_done=1;
wVerReq = MAKEWORD( 2, 0 );
err = WSAStartup(wVerReq,&wsaData);
@@ -522,7 +514,7 @@ void BIO_sock_cleanup(void)
if (wsa_init_done)
{
wsa_init_done=0;
-#ifndef OPENSSL_SYS_WINCE
+#if 0 /* this call is claimed to be non-present in Winsock2 */
WSACancelBlockingCall();
#endif
WSACleanup();