diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-11-16 00:44:21 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-11-16 00:44:21 (GMT) |
| commit | f33e8148fc6e214886a8b24fc9d743ee25da7d61 (patch) | |
| tree | 84eedf9bb648756e42489d65ab634a0b98dc2326 /src | |
| parent | b92c2f64953e8aabbf3644dc03524de048764c6a (diff) | |
| download | uscxml-f33e8148fc6e214886a8b24fc9d743ee25da7d61.zip uscxml-f33e8148fc6e214886a8b24fc9d743ee25da7d61.tar.gz uscxml-f33e8148fc6e214886a8b24fc9d743ee25da7d61.tar.bz2 | |
Renamed nonsense curlReq to evhttpReq
Diffstat (limited to 'src')
4 files changed, 8 insertions, 8 deletions
diff --git a/src/uscxml/plugins/invoker/http/HTTPServletInvoker.cpp b/src/uscxml/plugins/invoker/http/HTTPServletInvoker.cpp index d259e9a..1e0fced 100644 --- a/src/uscxml/plugins/invoker/http/HTTPServletInvoker.cpp +++ b/src/uscxml/plugins/invoker/http/HTTPServletInvoker.cpp @@ -119,12 +119,12 @@ bool HTTPServletInvoker::httpRecvRequest(const HTTPServer::Request& req) { // evhttp_request_own(req.curlReq); - _requests[toStr((uintptr_t)req.curlReq)] = req; + _requests[toStr((uintptr_t)req.evhttpReq)] = req; Event event = req; event.name = _callback; - event.data.compound["reqId"] = Data(toStr((uintptr_t)req.curlReq), Data::VERBATIM); + event.data.compound["reqId"] = Data(toStr((uintptr_t)req.evhttpReq), Data::VERBATIM); returnEvent(event); return true; diff --git a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp index c0a0a07..d4355b5 100644 --- a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp +++ b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp @@ -69,8 +69,8 @@ bool XHTMLInvoker::httpRecvRequest(const HTTPServer::Request& req) { if (iequals(req.data["type"].atom, "get")) { // the long-polling GET if (_longPoll) { - evhttp_send_error(_longPoll.curlReq, 204, NULL); - _longPoll.curlReq = NULL; + evhttp_send_error(_longPoll.evhttpReq, 204, NULL); + _longPoll.evhttpReq = NULL; } _longPoll = req; if (!_outQueue.empty()) { @@ -141,7 +141,7 @@ bool XHTMLInvoker::httpRecvRequest(const HTTPServer::Request& req) { HTTPServer::reply(reply); // queue invoke request for initial html - _longPoll.curlReq = NULL; + _longPoll.evhttpReq = NULL; _outQueue = std::deque<SendRequest>(); SendRequest sendReq(_invokeReq); send(sendReq); @@ -172,7 +172,7 @@ void XHTMLInvoker::send(const SendRequest& req) { return; } reply(reqCopy, _longPoll); - _longPoll.curlReq = NULL; + _longPoll.evhttpReq = NULL; } void XHTMLInvoker::reply(const SendRequest& req, const HTTPServer::Request& longPoll) { diff --git a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp index 2edb8ba..6632dc1 100644 --- a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp +++ b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp @@ -104,7 +104,7 @@ bool BasicHTTPIOProcessor::httpRecvRequest(const HTTPServer::Request& req) { reqEvent.name = "http." + req.data.compound.at("type").atom; returnEvent(reqEvent); - evhttp_send_reply(req.curlReq, 200, "OK", NULL); + evhttp_send_reply(req.evhttpReq, 200, "OK", NULL); return true; } diff --git a/src/uscxml/plugins/ioprocessor/comet/CometIOProcessor.cpp b/src/uscxml/plugins/ioprocessor/comet/CometIOProcessor.cpp index 5633f0e..32052c7 100644 --- a/src/uscxml/plugins/ioprocessor/comet/CometIOProcessor.cpp +++ b/src/uscxml/plugins/ioprocessor/comet/CometIOProcessor.cpp @@ -101,7 +101,7 @@ bool CometIOProcessor::httpRecvRequest(const HTTPServer::Request& request) { if (_longPollingReq) // send 204 to last request and remember new one - evhttp_send_error(_longPollingReq.curlReq, 204, NULL); + evhttp_send_error(_longPollingReq.evhttpReq, 204, NULL); _longPollingReq = request; if (!_outQueue.empty()) { send(_outQueue.front()); |