It's inappropraite to override application signal, nor is it appropriate
authorAndy Polyakov <appro@openssl.org>
Sun, 16 Sep 2007 18:35:02 +0000 (18:35 +0000)
committerAndy Polyakov <appro@openssl.org>
Sun, 16 Sep 2007 18:35:02 +0000 (18:35 +0000)
to shut down Winsock unless we know it won't be used [and we never do].
PR: 1439

crypto/bio/b_sock.c

index c8ca592..e4c7ee1 100644 (file)
@@ -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();