diff --git a/CMakeLists.txt b/CMakeLists.txt index bbb809c7..35a480be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -768,7 +768,7 @@ endif() # set(CPACK_PACKAGE_NAME "GmSSL") set(CPACK_PACKAGE_VENDOR "GmSSL develop team") -set(CPACK_PACKAGE_VERSION "3.2.0-dev.1016") +set(CPACK_PACKAGE_VERSION "3.2.0-dev.1017") set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md) set(CPACK_NSIS_MODIFY_PATH ON) include(CPack) diff --git a/include/gmssl/version.h b/include/gmssl/version.h index d3705b68..ef1d88b4 100644 --- a/include/gmssl/version.h +++ b/include/gmssl/version.h @@ -19,7 +19,7 @@ extern "C" { // Also update CPACK_PACKAGE_VERSION in CMakeLists.txt #define GMSSL_VERSION_NUM 30200 -#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1016" +#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1017" int gmssl_version_num(void); const char *gmssl_version_str(void); diff --git a/src/tls.c b/src/tls.c index 06633612..ca8758bc 100644 --- a/src/tls.c +++ b/src/tls.c @@ -3143,25 +3143,13 @@ int tls_set_verbose(TLS_CONNECT *conn, int verbose) int tls_set_socket(TLS_CONNECT *conn, tls_socket_t sock) { -#ifdef WIN32 - u_long flags = 0; // TODO: 0 == blocking, 1 == non-blocking - if(ioctlsocket(sock, FIONBIO, &flags) != 0) { - error_puts("socket in non-blocking mode"); - //nginx will pass a socket in non-blocking mode - //return -1; // FIXME - } -#else +#ifndef WIN32 int flags = 0; if ((flags = fcntl(sock, F_GETFL)) == -1) { error_print(); perror("fcntl error"); return -1; } - if (flags & O_NONBLOCK) { - error_puts("socket in non-blocking mode"); - //nginx will pass a socket in non-blocking mode - //return -1; // FIXME - } #endif conn->sock = sock; return 1;