Merge branch 'bugfix/close_socket_when_tcp_connecting' into 'master'

Close socket request will abort tcp write/connect

See merge request idf/esp-idf!1687
This commit is contained in:
Jiang Jiang Jian 2018-03-08 20:34:40 +08:00
commit 1d49c0953e

View file

@ -1085,12 +1085,6 @@ lwip_netconn_do_delconn(void *m)
} else } else
#endif /* LWIP_NETCONN_FULLDUPLEX */ #endif /* LWIP_NETCONN_FULLDUPLEX */
{ {
if (!(state != NETCONN_CONNECT || IN_NONBLOCKING_CONNECT(msg->conn))) {
msg->err = ERR_INPROGRESS;
NETCONN_SET_SAFE_ERR(msg->conn, ERR_INPROGRESS);
LWIP_DEBUGF(API_MSG_DEBUG, ("netconn error:ERR_INPROGRESS\n"));
return;
}
/* Drain and delete mboxes */ /* Drain and delete mboxes */
netconn_drain(msg->conn); netconn_drain(msg->conn);