Mercurial > hg > orthanc

comparison Core/WebServiceParameters.cpp @ 2145:39f4207727db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 17:09:29 +0100
parents fd5875662670
children 68557554348f
comparison
equal deleted inserted replaced
2144:a979ded1dbb1 2145:39f4207727db
32 32
33 #include "PrecompiledHeaders.h" 33 #include "PrecompiledHeaders.h"
34 #include "WebServiceParameters.h" 34 #include "WebServiceParameters.h"
35 35
36 #include "../Core/Logging.h" 36 #include "../Core/Logging.h"
37 #include "../Core/SystemToolbox.h"
38 #include "../Core/Toolbox.h" 37 #include "../Core/Toolbox.h"
39 #include "../Core/OrthancException.h" 38 #include "../Core/OrthancException.h"
39
40 #if ORTHANC_SANDBOXED == 0
41 # include "../Core/SystemToolbox.h"
42 #endif
40 43
41 #include <cassert> 44 #include <cassert>
42 45
43 namespace Orthanc 46 namespace Orthanc
44 { 47 {
56 certificateKeyFile_.clear(); 59 certificateKeyFile_.clear();
57 certificateKeyPassword_.clear(); 60 certificateKeyPassword_.clear();
58 } 61 }
59 62
60 63
64 #if ORTHANC_SANDBOXED == 0
61 void WebServiceParameters::SetClientCertificate(const std::string& certificateFile, 65 void WebServiceParameters::SetClientCertificate(const std::string& certificateFile,
62 const std::string& certificateKeyFile, 66 const std::string& certificateKeyFile,
63 const std::string& certificateKeyPassword) 67 const std::string& certificateKeyPassword)
64 { 68 {
65 if (certificateFile.empty()) 69 if (certificateFile.empty())
83 advancedFormat_ = true; 87 advancedFormat_ = true;
84 certificateFile_ = certificateFile; 88 certificateFile_ = certificateFile;
85 certificateKeyFile_ = certificateKeyFile; 89 certificateKeyFile_ = certificateKeyFile;
86 certificateKeyPassword_ = certificateKeyPassword; 90 certificateKeyPassword_ = certificateKeyPassword;
87 } 91 }
92 #endif
88 93
89 94
90 static void AddTrailingSlash(std::string& url) 95 static void AddTrailingSlash(std::string& url)
91 { 96 {
92 if (url.size() != 0 && 97 if (url.size() != 0 &&