comparison OrthancServer/main.cpp @ 3138:ab46e537f92e

renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 17 Jan 2019 18:29:16 +0100
parents 5a3b961e9524
children af4fab776ff2
comparison
equal deleted inserted replaced
3137:5a3b961e9524 3138:ab46e537f92e
39 #include "../Core/DicomFormat/DicomArray.h" 39 #include "../Core/DicomFormat/DicomArray.h"
40 #include "../Core/DicomNetworking/DicomServer.h" 40 #include "../Core/DicomNetworking/DicomServer.h"
41 #include "../Core/DicomParsing/FromDcmtkBridge.h" 41 #include "../Core/DicomParsing/FromDcmtkBridge.h"
42 #include "../Core/HttpServer/EmbeddedResourceHttpHandler.h" 42 #include "../Core/HttpServer/EmbeddedResourceHttpHandler.h"
43 #include "../Core/HttpServer/FilesystemHttpHandler.h" 43 #include "../Core/HttpServer/FilesystemHttpHandler.h"
44 #include "../Core/HttpServer/MongooseServer.h" 44 #include "../Core/HttpServer/HttpServer.h"
45 #include "../Core/Logging.h" 45 #include "../Core/Logging.h"
46 #include "../Core/Lua/LuaFunctionCall.h" 46 #include "../Core/Lua/LuaFunctionCall.h"
47 #include "../Plugins/Engine/OrthancPlugins.h" 47 #include "../Plugins/Engine/OrthancPlugins.h"
48 #include "OrthancConfiguration.h" 48 #include "OrthancConfiguration.h"
49 #include "OrthancFindRequestHandler.h" 49 #include "OrthancFindRequestHandler.h"
795 return WaitForExit(context, restApi); 795 return WaitForExit(context, restApi);
796 } 796 }
797 else 797 else
798 { 798 {
799 MyIncomingHttpRequestFilter httpFilter(context, plugins); 799 MyIncomingHttpRequestFilter httpFilter(context, plugins);
800 MongooseServer httpServer; 800 HttpServer httpServer;
801 bool httpDescribeErrors; 801 bool httpDescribeErrors;
802 802
803 #if ORTHANC_ENABLE_MONGOOSE == 1 803 #if ORTHANC_ENABLE_MONGOOSE == 1
804 const bool defaultKeepAlive = false; 804 const bool defaultKeepAlive = false;
805 #elif ORTHANC_ENABLE_CIVETWEB == 1 805 #elif ORTHANC_ENABLE_CIVETWEB == 1