Merge branch 'gitee-master' into gitlab-upstream

This commit is contained in:
zhengshuxin 2024-04-02 09:45:30 +08:00
commit da538cc962

View File

@ -182,6 +182,8 @@ void openssl_io::destroy(void)
} }
} }
#ifdef HAS_OPENSSL
static bool set_sock_timeo(ACL_SOCKET fd, int opt, int timeout) static bool set_sock_timeo(ACL_SOCKET fd, int opt, int timeout)
{ {
if (timeout <= 0) { if (timeout <= 0) {
@ -209,6 +211,8 @@ static bool set_sock_timeo(ACL_SOCKET fd, int opt, int timeout)
return true; return true;
} }
#endif
bool openssl_io::open(ACL_VSTREAM* s) bool openssl_io::open(ACL_VSTREAM* s)
{ {
if (s == NULL) { if (s == NULL) {