diff --git a/server/wsproxy/mastermgr.cc b/server/wsproxy/mastermgr.cc index cefa2fa..2f86ed1 100644 --- a/server/wsproxy/mastermgr.cc +++ b/server/wsproxy/mastermgr.cc @@ -3,6 +3,7 @@ #include #include +#include #include #include @@ -127,9 +128,6 @@ void MasterMgr::_SS_MS_HttpTunnelResponse(f8::MsgHdr* hdr, const ss::SS_MS_HttpT ss::SS_HttpTunnelRequest msg; conn.lock()->SendMsg(req->socket_handle, msg); if (!req->timer_wp.expired()) { - f8::Timer::Instance()->FireEvent(req->timer_wp, - ALLOC_TARGET_SERVER_SUCCESS_TIMER_EVENT, - nullptr); f8::Timer::Instance()->Delete(req->timer_wp); } RemoveHttpTunnelRequest(req->socket_handle); @@ -312,8 +310,9 @@ void MasterMgr::AddHttpTunnelRequest(int socket_handle, std::shared_ptrRemoveHttpTunnelRequest(req->socket_handle); - } else if (ALLOC_TARGET_SERVER_SUCCESS_TIMER_EVENT == event) { + req->request->GetResp()->SetVal("errcode", 0); + req->request->GetResp()->SetVal("errmsg", ""); + req->request->Response(); MasterMgr::Instance()->RemoveHttpTunnelRequest(req->socket_handle); } }