Changeset 5344


Ignore:
Timestamp:
Jun 15, 2016 1:59:14 AM (3 years ago)
Author:
ming
Message:

Re #1930: Revert back the change to comment do_handshake() in on_accept_complete() committed in r5343.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

    r5343 r5344  
    19691969    ssock->ssl_state = SSL_STATE_HANDSHAKING; 
    19701970    SSL_set_accept_state(ssock->ossl_ssl); 
    1971     //To avoid race condition, we don't need to do it here and 
    1972     //let the handshake happen in ssock->asock's callback instead. 
    1973     //status = do_handshake(ssock); 
     1971    status = do_handshake(ssock); 
    19741972 
    19751973on_return: 
    1976     if (ssock && status != PJ_SUCCESS) { 
    1977         //on_handshake_complete(ssock, status); 
    1978         close_sockets(ssock); 
     1974    if (ssock && status != PJ_EPENDING) { 
     1975        on_handshake_complete(ssock, status); 
    19791976    } 
    19801977 
Note: See TracChangeset for help on using the changeset viewer.