]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'stable' into develop
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 17 Aug 2024 15:29:18 +0000 (17:29 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 17 Aug 2024 15:29:18 +0000 (17:29 +0200)
1  2 
doc/Home.md
src/Model/Contact.php
src/Worker/OnePoll.php

diff --cc doc/Home.md
Simple merge
Simple merge
index e2db89fce52ee86a7d08e95691b48d89757e648f,dcfc55d0570177d383219985e1a57df7f1cb1422..10ddd266d798744bb4613b56dcf03bcb7a2b3256
@@@ -165,9 -165,9 +165,10 @@@ class OnePol
                }
  
                $cookiejar = tempnam(System::getTempPath(), 'cookiejar-onepoll-');
+               Item::incrementInbound(Protocol::FEED);
                $curlResult = DI::httpClient()->get($contact['poll'], HttpClientAccept::FEED_XML, [HttpClientOptions::COOKIEJAR => $cookiejar, HttpClientOptions::REQUEST => HttpClientRequest::FEEDFETCHER]);
                unlink($cookiejar);
 +              Logger::debug('Polled feed', ['url' => $contact['poll'], 'http-code' => $curlResult->getReturnCode(), 'redirect-url' => $curlResult->getRedirectUrl()]);
  
                if ($curlResult->isTimeout()) {
                        Logger::notice('Polling timed out', ['id' => $contact['id'], 'url' => $contact['poll']]);