diff --git a/server/wsproxy/mastermgr.cc b/server/wsproxy/mastermgr.cc index 2f86ed1..61926c0 100644 --- a/server/wsproxy/mastermgr.cc +++ b/server/wsproxy/mastermgr.cc @@ -127,15 +127,14 @@ void MasterMgr::_SS_MS_HttpTunnelResponse(f8::MsgHdr* hdr, const ss::SS_MS_HttpT if (!conn.expired()) { ss::SS_HttpTunnelRequest msg; conn.lock()->SendMsg(req->socket_handle, msg); - if (!req->timer_wp.expired()) { - f8::Timer::Instance()->Delete(req->timer_wp); - } - RemoveHttpTunnelRequest(req->socket_handle); return; } else { abort(); } } else { + req->request->GetResp()->SetVal("errcode", 500); + req->request->GetResp()->SetVal("errmsg", "server internal error"); + req->request->Response(); RemoveHttpTunnelRequest(req->socket_handle); } }