Browse Source

re-nest conditions in socket_fd_cb()

conn->state == SCK_STARTTLS implies conn->ssl != NULL.
1.4
Oswald Buddenhagen 5 years ago
parent
commit
8a03651dd8
  1. 8
      src/socket.c

8
src/socket.c

@ -1063,11 +1063,11 @@ socket_fd_cb( int events, void *aux )
conf_wakeup( &conn->fd_timeout, conn->conf->timeout ); conf_wakeup( &conn->fd_timeout, conn->conf->timeout );
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
if (conn->state == SCK_STARTTLS) {
start_tls_p2( conn );
return;
}
if (conn->ssl) { if (conn->ssl) {
if (conn->state == SCK_STARTTLS) {
start_tls_p2( conn );
return;
}
if (do_queued_write( conn ) < 0) if (do_queued_write( conn ) < 0)
return; return;
socket_fill( conn ); socket_fill( conn );

Loading…
Cancel
Save