fix #144 - get rid of stubbed windows ssl schannel backend
This commit is contained in:
		| @@ -129,9 +129,6 @@ if (USE_TLS) | ||||
|     elseif (APPLE AND NOT USE_OPEN_SSL) | ||||
|         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketAppleSSL.h) | ||||
|         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketAppleSSL.cpp) | ||||
|     elseif (WIN32 AND NOT USE_OPEN_SSL) | ||||
|         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketSChannel.h) | ||||
|         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketSChannel.cpp) | ||||
|     else() | ||||
|         set(USE_OPEN_SSL ON) | ||||
|         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketOpenSSL.h) | ||||
|   | ||||
| @@ -21,6 +21,7 @@ FROM alpine:3.11 as runtime | ||||
|  | ||||
| RUN apk add --no-cache libstdc++ | ||||
| RUN apk add --no-cache strace | ||||
| RUN apk add --no-cache gdb | ||||
|  | ||||
| RUN addgroup -S app && adduser -S -G app app  | ||||
| COPY --chown=app:app --from=build /usr/local/bin/ws /usr/local/bin/ws | ||||
| @@ -36,4 +37,3 @@ WORKDIR /home/app | ||||
|  | ||||
| ENTRYPOINT ["ws"] | ||||
| EXPOSE 8008 | ||||
| C | ||||
|   | ||||
| @@ -1,6 +1,10 @@ | ||||
| # Changelog | ||||
| All changes to this project will be documented in this file. | ||||
|  | ||||
| ## [7.9.5] - 2020-01-14 | ||||
|  | ||||
| (windows) fix #144, get rid of stubbed/un-implemented windows schannel ssl backend | ||||
|  | ||||
| ## [7.9.4] - 2020-01-12 | ||||
|  | ||||
| (openssl + mbedssl) fix #140, can send large files with ws send over ssl / still broken with apple ssl | ||||
|   | ||||
| @@ -14,8 +14,6 @@ | ||||
| #include "IXSocketOpenSSL.h" | ||||
| #elif __APPLE__ | ||||
| #include "IXSocketAppleSSL.h" | ||||
| #elif defined(_WIN32) | ||||
| #include "IXSocketSChannel.h" | ||||
| #endif | ||||
|  | ||||
| #else | ||||
| @@ -46,8 +44,6 @@ namespace ix | ||||
|             socket = std::make_shared<SocketMbedTLS>(tlsOptions, fd); | ||||
| #elif defined(IXWEBSOCKET_USE_OPEN_SSL) | ||||
|             socket = std::make_shared<SocketOpenSSL>(tlsOptions, fd); | ||||
| #elif defined(_WIN32) | ||||
|             socket = std::make_shared<SocketSChannel>(tlsOptions, fd); | ||||
| #elif defined(__APPLE__) | ||||
|             socket = std::make_shared<SocketAppleSSL>(tlsOptions, fd); | ||||
| #endif | ||||
|   | ||||
| @@ -6,4 +6,4 @@ | ||||
|  | ||||
| #pragma once | ||||
|  | ||||
| #define IX_WEBSOCKET_VERSION "7.9.4" | ||||
| #define IX_WEBSOCKET_VERSION "7.9.5" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user