From a5ddb7df2e5d88d33c8314740f825e5e4c05f0b2 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Wed, 16 Dec 2015 07:32:12 -0600 Subject: [PATCH] ssld: check conn->plain_fd when setting conn->plain_fd type to RB_FD_SOCKET --- ssld/ssld.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ssld/ssld.c b/ssld/ssld.c index ee76be87..6c7dcba8 100644 --- a/ssld/ssld.c +++ b/ssld/ssld.c @@ -762,11 +762,9 @@ ssl_process_accept(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb) SetSSL(conn); if(rb_get_type(conn->mod_fd) & RB_FD_UNKNOWN) - { - rb_set_type(conn->mod_fd, RB_FD_SOCKET); - } - if(rb_get_type(conn->mod_fd) == RB_FD_UNKNOWN) + + if(rb_get_type(conn->plain_fd) == RB_FD_UNKNOWN) rb_set_type(conn->plain_fd, RB_FD_SOCKET); rb_ssl_start_accepted(ctlb->F[0], ssl_process_accept_cb, conn, 10); @@ -792,7 +790,7 @@ ssl_process_connect(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb) if(rb_get_type(conn->mod_fd) == RB_FD_UNKNOWN) rb_set_type(conn->mod_fd, RB_FD_SOCKET); - if(rb_get_type(conn->mod_fd) == RB_FD_UNKNOWN) + if(rb_get_type(conn->plain_fd) == RB_FD_UNKNOWN) rb_set_type(conn->plain_fd, RB_FD_SOCKET);