Prechádzať zdrojové kódy

re-nest conditions in socket_fd_cb()

conn->state == SCK_STARTTLS implies conn->ssl != NULL.
Oswald Buddenhagen 5 rokov pred
rodič
commit
8a03651dd8
1 zmenil súbory, kde vykonal 4 pridanie a 4 odobranie
  1. 4 4
      src/socket.c

+ 4 - 4
src/socket.c

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