diff options
| author | Stefan Radomski <github@mintwerk.de> | 2017-06-02 12:54:23 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2017-06-02 12:54:23 (GMT) |
| commit | d1404b669a00a6cff2ac35f09d0222c1d9ab4bff (patch) | |
| tree | 3e6b6201089104f37816d7ad14b608b859178a61 /src | |
| parent | 548ca64879a3831abe9102eedad87de0326c6099 (diff) | |
| download | uscxml-d1404b669a00a6cff2ac35f09d0222c1d9ab4bff.zip uscxml-d1404b669a00a6cff2ac35f09d0222c1d9ab4bff.tar.gz uscxml-d1404b669a00a6cff2ac35f09d0222c1d9ab4bff.tar.bz2 | |
Added UTF8 tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/uscxml/Interpreter.cpp | 12 | ||||
| -rw-r--r-- | src/uscxml/server/HTTPServer.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/uscxml/Interpreter.cpp b/src/uscxml/Interpreter.cpp index 0758cd1..59a5084 100644 --- a/src/uscxml/Interpreter.cpp +++ b/src/uscxml/Interpreter.cpp @@ -98,7 +98,7 @@ Interpreter Interpreter::fromXML(const std::string& xml, const std::string& base Interpreter Interpreter::fromElement(XERCESC_NS::DOMElement* scxml, const std::string& baseURL) { URL absUrl = normalizeURL(baseURL); - + std::shared_ptr<InterpreterImpl> interpreterImpl(new InterpreterImpl()); Interpreter interpreter(interpreterImpl); @@ -148,12 +148,12 @@ Interpreter Interpreter::fromURL(const std::string& url) { URL absUrl = normalizeURL(url); #ifdef _WIN32 - // Xercesc is hard to build with SSL on windows, whereas curl uses winssl - if (absUrl.scheme() == "https") { - return fromXML(absUrl.getInContent(), absUrl); - } + // Xercesc is hard to build with SSL on windows, whereas curl uses winssl + if (absUrl.scheme() == "https") { + return fromXML(absUrl.getInContent(), absUrl); + } #endif - + std::shared_ptr<InterpreterImpl> interpreterImpl(new InterpreterImpl()); Interpreter interpreter(interpreterImpl); diff --git a/src/uscxml/server/HTTPServer.cpp b/src/uscxml/server/HTTPServer.cpp index e9a1039..aa43002 100644 --- a/src/uscxml/server/HTTPServer.cpp +++ b/src/uscxml/server/HTTPServer.cpp @@ -129,7 +129,7 @@ HTTPServer::HTTPServer(unsigned short port, unsigned short wsPort, SSLConfig* ss SSL_library_init (); SSL_load_error_strings (); - ERR_load_crypto_strings(); + ERR_load_crypto_strings(); OpenSSL_add_all_algorithms (); SSL_CTX *ctx = SSL_CTX_new (SSLv23_server_method ()); @@ -144,7 +144,7 @@ HTTPServer::HTTPServer(unsigned short port, unsigned short wsPort, SSLConfig* ss goto FAIL_SSL_SETUP; } if (1 != SSL_CTX_set_tmp_ecdh (ctx, ecdh)) { - LOGD(USCXML_ERROR) << ("SSL_CTX_set_tmp_ecdh") << ERR_error_string(ERR_get_error(), NULL); + LOGD(USCXML_ERROR) << ("SSL_CTX_set_tmp_ecdh") << ERR_error_string(ERR_get_error(), NULL); goto FAIL_SSL_SETUP; } |