From 771ebb2a4c0e19f25d95146b12a3989b44d819ed Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Thu, 26 Mar 2020 19:40:52 -0700 Subject: [PATCH] (mac ssl) rename DarwinSSL -> SecureTransport (see this too -> https://github.com/curl/curl/issues/3733) --- .github/workflows/ccpp.yml | 2 +- docs/CHANGELOG.md | 4 ++++ ixwebsocket/IXUserAgent.cpp | 2 +- ixwebsocket/IXWebSocketVersion.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 204af21c..c5204ff3 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -12,7 +12,7 @@ jobs: - name: make test run: make test - mac_tsan: + mac_tsan_sectransport: runs-on: macOS-latest steps: - uses: actions/checkout@v1 diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 7a6a6b54..d9fb2202 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All changes to this project will be documented in this file. +## [9.1.2] - 2020-03-26 + +(mac ssl) rename DarwinSSL -> SecureTransport (see this too -> https://github.com/curl/curl/issues/3733) + ## [9.1.1] - 2020-03-26 (websocket) fix data race accessing _socket object without mutex protection when calling wakeUpFromPoll in WebSocketTransport.cpp diff --git a/ixwebsocket/IXUserAgent.cpp b/ixwebsocket/IXUserAgent.cpp index 3f1394a1..85fb9992 100644 --- a/ixwebsocket/IXUserAgent.cpp +++ b/ixwebsocket/IXUserAgent.cpp @@ -71,7 +71,7 @@ namespace ix #elif defined(IXWEBSOCKET_USE_OPEN_SSL) ss << " ssl/OpenSSL " << OPENSSL_VERSION_TEXT; #elif __APPLE__ - ss << " ssl/DarwinSSL"; + ss << " ssl/SecureTransport"; #endif #else ss << " nossl"; diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h index 4557837d..898a1e6b 100644 --- a/ixwebsocket/IXWebSocketVersion.h +++ b/ixwebsocket/IXWebSocketVersion.h @@ -6,4 +6,4 @@ #pragma once -#define IX_WEBSOCKET_VERSION "9.1.1" +#define IX_WEBSOCKET_VERSION "9.1.2"