Mercurial > hg > orthanc

comparison Core/HttpServer/MongooseServer.cpp @ 2136:dd609a99d39a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uniformization of the macro naming
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 14:08:05 +0100
parents ddc75c6c712d
children 595cf22b3e7e
comparison
equal deleted inserted replaced
2135:cadfe0a2a393 2136:dd609a99d39a
47 #include <iostream> 47 #include <iostream>
48 #include <string.h> 48 #include <string.h>
49 #include <stdio.h> 49 #include <stdio.h>
50 #include <boost/thread.hpp> 50 #include <boost/thread.hpp>
51 51
52 #if ORTHANC_SSL_ENABLED == 1 52 #if ORTHANC_ENABLE_SSL == 1
53 #include <openssl/opensslv.h> 53 #include <openssl/opensslv.h>
54 #endif 54 #endif
55 55
56 #define ORTHANC_REALM "Orthanc Secure Area" 56 #define ORTHANC_REALM "Orthanc Secure Area"
57 57
872 filter_ = NULL; 872 filter_ = NULL;
873 keepAlive_ = false; 873 keepAlive_ = false;
874 httpCompression_ = true; 874 httpCompression_ = true;
875 exceptionFormatter_ = NULL; 875 exceptionFormatter_ = NULL;
876 876
877 #if ORTHANC_SSL_ENABLED == 1 877 #if ORTHANC_ENABLE_SSL == 1
878 // Check for the Heartbleed exploit 878 // Check for the Heartbleed exploit
879 // https://en.wikipedia.org/wiki/OpenSSL#Heartbleed_bug 879 // https://en.wikipedia.org/wiki/OpenSSL#Heartbleed_bug
880 if (OPENSSL_VERSION_NUMBER < 0x1000107fL /* openssl-1.0.1g */ && 880 if (OPENSSL_VERSION_NUMBER < 0x1000107fL /* openssl-1.0.1g */ &&
881 OPENSSL_VERSION_NUMBER >= 0x1000100fL /* openssl-1.0.1 */) 881 OPENSSL_VERSION_NUMBER >= 0x1000100fL /* openssl-1.0.1 */)
882 { 882 {
973 973
974 void MongooseServer::SetSslEnabled(bool enabled) 974 void MongooseServer::SetSslEnabled(bool enabled)
975 { 975 {
976 Stop(); 976 Stop();
977 977
978 #if ORTHANC_SSL_ENABLED == 0 978 #if ORTHANC_ENABLE_SSL == 0
979 if (enabled) 979 if (enabled)
980 { 980 {
981 throw OrthancException(ErrorCode_SslDisabled); 981 throw OrthancException(ErrorCode_SslDisabled);
982 } 982 }
983 else 983 else