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

bsergean · bsergean · commit d3bcbdac26ec · 2020-08-13T22:10:38.000-07:00
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 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
 
 (websocket proxy server) add ability to map different hosts to different websocket servers, using a json config file
diff --git a/ixwebsocket/IXWebSocketProxyServer.cpp b/ixwebsocket/IXWebSocketProxyServer.cpp
@@ -97,7 +97,7 @@ namespace ix
                                 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)
                             url += msg->openInfo.uri;
 
diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "10.1.9"
+#define IX_WEBSOCKET_VERSION "10.2.0"
diff --git a/third_party/nlohmann/json.hpp b/third_party/nlohmann/json.hpp

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ namespace ix`
`97`	`97`	`url = it->second;`
`98`	`98`	`}`
`99`	`99`
`100`		`- // append the uri to form the full url`
	`100`	`+ // append the uri to form the full url`
`101`	`101`	`// (say ws://localhost:1234/foo/?bar=baz)`
`102`	`102`	`url += msg->openInfo.uri;`
`103`	`103`