From 7622c3741bd85cd6c8d5a1aa863c2a310ca735f0 Mon Sep 17 00:00:00 2001 From: Ian Craggs Date: Tue, 10 Dec 2019 15:28:48 +0000 Subject: [PATCH] WS proxy fix & MacOS compile warning fix --- src/MQTTProtocolOut.c | 4 ++-- src/WebSocket.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MQTTProtocolOut.c b/src/MQTTProtocolOut.c index 6a9da1a3..58c3a9d9 100644 --- a/src/MQTTProtocolOut.c +++ b/src/MQTTProtocolOut.c @@ -198,9 +198,9 @@ int MQTTProtocol_connect(const char* ip_address, Clients* aClient, int websocket if (timeout < 0) rc = -1; else - rc = Socket_new(aClient->net.http_proxy, addr_len, port, &(aClient->net.socket), timeout); + rc = Socket_new(aClient->net.https_proxy, addr_len, port, &(aClient->net.socket), timeout); #else - rc = Socket_new(aClient->net.http_proxy, addr_len, port, &(aClient->net.socket)); + rc = Socket_new(aClient->net.https_proxy, addr_len, port, &(aClient->net.socket)); #endif } #endif diff --git a/src/WebSocket.c b/src/WebSocket.c index 415ea8d9..2060b7a5 100644 --- a/src/WebSocket.c +++ b/src/WebSocket.c @@ -379,7 +379,7 @@ int WebSocket_connect( networkHandles *net, const char *uri ) headers_buf_cur += sprintf(headers_buf_cur, "%s: %s\r\n", headers->name, headers->value); headers++; } - headers_buf_cur = '\0'; + *headers_buf_cur = '\0'; } for ( i = 0; i < 2; ++i )