diff options
| author | George Hazan <george.hazan@gmail.com> | 2025-04-07 17:06:06 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2025-04-07 17:06:10 +0300 |
| commit | 3cdfa14f90f20351f210eb3d519660b46141a440 (patch) | |
| tree | 6179c2947123a598619d38443482b081dd3bfea2 /protocols/SkypeWeb/src/skype_polling.cpp | |
| parent | 59363a7c61dfda1b39a64780cf270d2a92a352f5 (diff) | |
fixes #4960 (SkypeWeb: утечка, приводящая со временем к неработоспособности сети во всей ОС)
Diffstat (limited to 'protocols/SkypeWeb/src/skype_polling.cpp')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_polling.cpp | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/protocols/SkypeWeb/src/skype_polling.cpp b/protocols/SkypeWeb/src/skype_polling.cpp index ed7b50938e..2821f06d34 100644 --- a/protocols/SkypeWeb/src/skype_polling.cpp +++ b/protocols/SkypeWeb/src/skype_polling.cpp @@ -27,14 +27,34 @@ void CSkypeProto::PollingThread(void *) if (m_isTerminated || m_szId == nullptr)
break;
- std::unique_ptr<PollRequest> request(new PollRequest(this));
- request->nlc = m_hPollingConn;
- NLHR_PTR response(DoSend(request.get()));
+ AsyncHttpRequest req(REQUEST_POST, HOST_DEFAULT, "/users/ME/endpoints/" + mir_urlEncode(m_szId) + "/subscriptions/0/poll");
+ req.flags |= NLHRF_PERSISTENT;
+ req.timeout = 120000;
+ req.nlc = m_hPollingConn;
+
+ if (m_iPollingId != -1)
+ req.m_szUrl.AppendFormat("?ackId=%d", m_iPollingId);
+
+ req.AddHeader("Referer", "https://web.skype.com/main");
+ req.AddHeader("ClientInfo", "os=Windows; osVer=8.1; proc=Win32; lcid=en-us; deviceType=1; country=n/a; clientName=swx-skype.com; clientVer=908/1.85.0.29");
+ req.AddHeader("Accept", "application/json");
+ req.AddHeader("Accept-Language", "en, C");
+
+ NLHR_PTR response(DoSend(&req));
if (m_isTerminated || m_szId == nullptr)
break;
- if (response == nullptr || response->resultCode != 200) {
- m_hPollingConn = nullptr;
+ // no network?..
+ if (response == nullptr)
+ break;
+
+ if (response->resultCode != 200) {
+ auto reply = JSONNode::parse(response->body);
+ if (reply && reply["message"]["errorCode"] == 729) // endpoint broken, log off
+ break;
+
+ Sleep(200);
+ m_hPollingConn = response->nlc;
continue;
}
|