Merge branch 'refactor_webserver_server_class' of https://github.com/gaudryc/domoticz into gaudryc-refactor_webserver_server_class

Conflicts:
	History.txt

Author: gizmocuz

History.txt

@@ -43,6 +43,8 @@ Version 2.4xxx
 - Changed: OpenZwave, kWh sensor now maybe compatible with more hardware
 - Changed: OpenZwave, not sending cold-white in the colorclass, solved issues on different Zipato bulbs
 - Changed: OpenZWave, Renamed internally 'Color Control' to 'Color"
+- Changed: Webserver, Refactor the webserver server class to separate the HTTP and HTTPS implementation, and gather all server settings in the new server_settings and ssl_server_settings classes.
+- Changed: Webserver, Add -sslmethod, -ssloptions and -ssldhparam arguments to domoticz executable.
 - Fixed: Alert Sensor, displaying sValue again
 - Fixed: Blockly, Set user variables (you need to resave your blockly's)
 - Fixed: Blockly, string uservariables where saved with quotes when not using with set-after
@@ -82,7 +84,12 @@ Version 2.4xxx
 - Fixed: Fix a security issue (DOS) in webserver to prevent a remote_endpoint exception to be thrown to the WebServer class causing the webserver to be down (no possible stop and no possible connection). Now, the webserver can be scanned using the nmap tool (for the SSL configuration purpose).
 - Fixed: Under FreeBSD Hardware Monitor works, but it needs the libsysinfo package to work.
 - Fixed: Fix std::string::compare method issue (#507).
+<<<<<<< HEAD
 - Fixed: Fix the closure of the Web server sockets by making a graceful shutdown before closing.
+=======
+- Fixed: Fix the webserver not stopping and not restarting issue after an exception occurred.
+- Fixed: Fix multiple session cleaner start after restarting webserver.
+>>>>>>> e2e9e337b194ec3496412a2af0130d1202a17e08
 - Updated: OpenZWave, configuration files
 
 Version 2.3530 (November 1th 2015)

lua/src/CMakeLists.txt

@@ -13,8 +13,3 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 ADD_LIBRARY(lua STATIC ${LIB} ${CORE})
-#ADD_EXECUTABLE(luaexec lua.c)
-#TARGET_LINK_LIBRARIES(luaexec lua m) 
-
-#ADD_EXECUTABLE(luac luac.c)
-#TARGET_LINK_LIBRARIES(luac lua m)