Merge branch 'development' into LTS_development

# Conflicts: # lib/http_parser.cpp
2020-03-03 12:28:04 +01:00 · 2020-03-03 12:28:04 +01:00 · eb8694052d
commit eb8694052d
parent c528e51e7c 27a2e596fd
17 changed files with 401 additions and 304 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -186,6 +186,7 @@ set(libHeaders
  lib/ebml.h
  lib/ebml_socketglue.h
  lib/websocket.h
+  lib/url.h
 )

 ########################################
@ -240,6 +241,7 @@ add_library (mist
  lib/ebml.cpp
  lib/ebml_socketglue.cpp
  lib/websocket.cpp
+  lib/url.cpp
 )
 if (NOT APPLE)
  set (LIBRT -lrt)