diff options
Diffstat (limited to 'src/uscxml/server/HTTPServer.cpp')
| -rw-r--r-- | src/uscxml/server/HTTPServer.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/uscxml/server/HTTPServer.cpp b/src/uscxml/server/HTTPServer.cpp index f4b1a57..e37d8cc 100644 --- a/src/uscxml/server/HTTPServer.cpp +++ b/src/uscxml/server/HTTPServer.cpp @@ -38,6 +38,7 @@ HTTPServer::HTTPServer(unsigned short port) { _port = port; _base = event_base_new(); _http = evhttp_new(_base); + _thread = NULL; evhttp_set_allowed_methods(_http, EVHTTP_REQ_GET | @@ -63,6 +64,9 @@ HTTPServer::HTTPServer(unsigned short port) { } HTTPServer::~HTTPServer() { + _isRunning = false; + _thread->join(); + delete _thread; } HTTPServer* HTTPServer::_instance = NULL; @@ -229,7 +233,9 @@ void HTTPServer::httpRecvReqCallback(struct evhttp_request *req, void *callbackD std::string contentType = request.data.compound["header"].compound["Content-Type"].atom; if (false) { } else if (boost::iequals(contentType, "application/x-www-form-urlencoded")) { - request.data.compound["content"].atom = evhttp_decode_uri(request.data.compound["content"].atom.c_str()); + char* contentCStr = evhttp_decode_uri(request.data.compound["content"].atom.c_str()); + request.data.compound["content"].atom = contentCStr; + free(contentCStr); } else if (boost::iequals(contentType, "application/json")) { request.data.compound["content"] = Data::fromJSON(request.data.compound["content"].atom); } @@ -346,7 +352,7 @@ bool HTTPServer::registerServlet(const std::string& path, HTTPServlet* servlet) INSTANCE->_servlets[suffixedPath] = servlet; - LOG(INFO) << "HTTP Servlet listening at: " << servletURL.str() << std::endl; +// LOG(INFO) << "HTTP Servlet listening at: " << servletURL.str() << std::endl; // register callback evhttp_set_cb(INSTANCE->_http, ("/" + suffixedPath).c_str(), HTTPServer::httpRecvReqCallback, servlet); |