kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(ws) upgrade to latest version of nlohmann json (3.9.1 from 3.2.0)

Browse Source
This commit is contained in:
Benjamin Sergeant 2020-08-13 22:10:38 -07:00
parent 8c5b28adce
commit d3bcbdac26
4 changed files with 12480 additions and 5907 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/CHANGELOG.md
View File

@ -2,6 +2,10 @@
All changes to this project will be documented in this file. All changes to this project will be documented in this file.
## [10.2.0] - 2020-08-13
(ws) upgrade to latest version of nlohmann json (3.9.1 from 3.2.0)
## [10.1.9] - 2020-08-13 ## [10.1.9] - 2020-08-13
(websocket proxy server) add ability to map different hosts to different websocket servers, using a json config file (websocket proxy server) add ability to map different hosts to different websocket servers, using a json config file

2
ixwebsocket/IXWebSocketProxyServer.cpp
View File

@ -97,7 +97,7 @@ namespace ix
url = it->second; url = it->second;
} }
// append the uri to form the full url // append the uri to form the full url
// (say ws://localhost:1234/foo/?bar=baz) // (say ws://localhost:1234/foo/?bar=baz)
url += msg->openInfo.uri; url += msg->openInfo.uri;

2
ixwebsocket/IXWebSocketVersion.h
View File

@ -6,4 +6,4 @@
#pragma once #pragma once
#define IX_WEBSOCKET_VERSION "10.1.9" #define IX_WEBSOCKET_VERSION "10.2.0"

18379
third_party/nlohmann/json.hpp vendored
View File

File diff suppressed because it is too large Load Diff