Ver Fonte

Merge branch 'master' of https://github.com/civetweb/civetweb

bel2125 há 5 anos atrás
pai
commit
86771c3a9a
2 ficheiros alterados com 7 adições e 3 exclusões
  1. 5 1
      RELEASE_NOTES.md
  2. 2 2
      src/civetweb.c

+ 5 - 1
RELEASE_NOTES.md

@@ -1,10 +1,14 @@
 Release Notes v1.12
 ===
-### Objectives: *TO BE DEFINED*
+### Objectives: *Multiple improvements and extensions in various areas, including compatibility, Lua scripting, documentation*
 
 Changes
 -------
 
+- Updates/improvements for LuaXML
+- Updates and tests for JSON for Lua
+- BoringSSL support
+- Add Remark: Do not use Git for Windows V2.24 (but <= V2.23 or >= V2.25)
 - Format configuration dialogs for Windows
 - Add option "hide_tray" to start without Windows systray icon
 - URI checking according to "remove_dot_segments" algorithm from RFC

+ 2 - 2
src/civetweb.c

@@ -17085,8 +17085,8 @@ mg_connect_client2(const char *host,
 		return mg_connect_websocket_client(host,
 		                                   port,
 		                                   is_ssl,
-		                                   error->text,
-		                                   error->text_buffer_size,
+		                                   ((error != NULL) ? error->text : NULL),
+		                                   ((error != NULL) ? error->text_buffer_size : 0),
 		                                   (path ? path : ""),
 		                                   NULL /* TODO: origin */,
 		                                   deprecated_websocket_data_wrapper,