From ba4cf75e0f09a8a7ce137b6e11bae3e0d5429d47 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Fri, 6 Dec 2019 16:45:49 -0800 Subject: [PATCH] (mac) convert SSL errors to utf8 --- docs/CHANGELOG.md | 4 ++++ ixwebsocket/IXSocketAppleSSL.cpp | 2 +- ixwebsocket/IXWebSocketVersion.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index bfab2812..7d208f83 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All notable changes to this project will be documented in this file. +## [7.5.1] - 2019-12-06 + +(mac) convert SSL errors to utf8 + ## [7.5.0] - 2019-12-05 - (ws) cobra to sentry. Handle Error 429 Too Many Requests and politely wait before sending more data to sentry. diff --git a/ixwebsocket/IXSocketAppleSSL.cpp b/ixwebsocket/IXSocketAppleSSL.cpp index 5102bfeb..32a66130 100644 --- a/ixwebsocket/IXSocketAppleSSL.cpp +++ b/ixwebsocket/IXSocketAppleSSL.cpp @@ -118,7 +118,7 @@ namespace char localBuffer[128]; Boolean success; success = - CFStringGetCString(message, localBuffer, 128, CFStringGetSystemEncoding()); + CFStringGetCString(message, localBuffer, 128, kCFStringEncodingUTF8); if (success) { errMsg = localBuffer; diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h index f3e64936..337583e6 100644 --- a/ixwebsocket/IXWebSocketVersion.h +++ b/ixwebsocket/IXWebSocketVersion.h @@ -6,4 +6,4 @@ #pragma once -#define IX_WEBSOCKET_VERSION "7.5.0" +#define IX_WEBSOCKET_VERSION "7.5.1"