summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2007-09-16 18:35:45 +0000
committerAndy Polyakov <appro@openssl.org>2007-09-16 18:35:45 +0000
commit53b9696f3f34ff33ba549303b0c4345040d085c4 (patch)
tree01ad7b69a43c8235c2b3b65a521493098cfa6769
parent7e4fe4662b1222b1ed4d6a6cf5cb5aff7c397390 (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] [from HEAD]. PR: 1439
-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 4b3860b991..cd78de1e87 100644
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -456,9 +456,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));
if (WSAStartup(0x0101,&wsa_state)!=0)
@@ -484,11 +481,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);
@@ -511,7 +503,7 @@ void BIO_sock_cleanup(void)
{
wsa_init_done=0;
#ifndef OPENSSL_SYS_WINCE
- WSACancelBlockingCall();
+ WSACancelBlockingCall(); /* Winsock 1.1 specific */
#endif
WSACleanup();
}