OpenSSL: OpenSSL_0_9_8-stable: openssl/crypto/bio/ b_sock.c

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Andy
Polyakov
  Root:   /v/openssl/cvs                   Email:  approopenssl.org
  Module: openssl                          Date:  
16-Sep-2007 20:35:47
  Branch: OpenSSL_0_9_8-stable             Handle:
2007091619354500

  Modified files:           (Branch: OpenSSL_0_9_8-stable)
    openssl/crypto/bio      b_sock.c

  Log:
    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

  Summary:
    Revision    Changes     Path
    1.38.2.2    +1  -9      openssl/crypto/bio/b_sock.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/bio/b_sock.c
 
============================================================
================
  $ cvs diff -u -r1.38.2.1 -r1.38.2.2 b_sock.c
  --- openssl/crypto/bio/b_sock.c	13 Jun 2005 03:21:00
-0000	1.38.2.1
  +++ openssl/crypto/bio/b_sock.c	16 Sep 2007 18:35:45
-0000	1.38.2.2
   -456,9 +456,6 
   		{
   		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 
   
       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 
   		{
   		wsa_init_done=0;
   #ifndef OPENSSL_SYS_WINCE
  -		WSACancelBlockingCall();
  +		WSACancelBlockingCall();	/* Winsock 1.1 specific */
   #endif
   		WSACleanup();
   		}
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org