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
This commit is contained in:
Andy Polyakov
2007-09-16 18:35:45 +00:00
parent 7e4fe4662b
commit 53b9696f3f

View File

@@ -456,9 +456,6 @@ int BIO_sock_init(void)
{ {
int err; int err;
#ifdef SIGINT
signal(SIGINT,(void (*)(int))BIO_sock_cleanup);
#endif
wsa_init_done=1; wsa_init_done=1;
memset(&wsa_state,0,sizeof(wsa_state)); memset(&wsa_state,0,sizeof(wsa_state));
if (WSAStartup(0x0101,&wsa_state)!=0) if (WSAStartup(0x0101,&wsa_state)!=0)
@@ -484,11 +481,6 @@ int BIO_sock_init(void)
if (!wsa_init_done) if (!wsa_init_done)
{ {
# ifdef SIGINT
signal(SIGINT,(void (*)(int))BIO_sock_cleanup);
# endif
wsa_init_done=1; wsa_init_done=1;
wVerReq = MAKEWORD( 2, 0 ); wVerReq = MAKEWORD( 2, 0 );
err = WSAStartup(wVerReq,&wsaData); err = WSAStartup(wVerReq,&wsaData);
@@ -511,7 +503,7 @@ void BIO_sock_cleanup(void)
{ {
wsa_init_done=0; wsa_init_done=0;
#ifndef OPENSSL_SYS_WINCE #ifndef OPENSSL_SYS_WINCE
WSACancelBlockingCall(); WSACancelBlockingCall(); /* Winsock 1.1 specific */
#endif #endif
WSACleanup(); WSACleanup();
} }