<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU APGL version 3 or any later version
*
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public function get(string $url, array $opts = [], int &$redirects = 0)
+ public function get(string $url, array $opts = [], &$redirects = 0)
{
- $stamp1 = microtime(true);
+ $this->profiler->startRecording('network');
+
+ if (Network::isLocalLink($url)) {
+ $this->logger->info('Local link', ['url' => $url, 'callstack' => System::callstack(20)]);
+ }
if (strlen($url) > 1000) {
$this->logger->debug('URL is longer than 1000 characters.', ['url' => $url, 'callstack' => System::callstack(20)]);
+ $this->profiler->stopRecording();
return CurlResult::createErrorCurl(substr($url, 0, 200));
}
if (Network::isUrlBlocked($url)) {
$this->logger->info('Domain is blocked.', ['url' => $url]);
+ $this->profiler->stopRecording();
return CurlResult::createErrorCurl($url);
}
$ch = @curl_init($url);
if (($redirects > 8) || (!$ch)) {
+ $this->profiler->stopRecording();
return CurlResult::createErrorCurl($url);
}
curl_setopt($ch, CURLOPT_ENCODING, '');
if (!empty($opts['headers'])) {
- $this->logger->warning('Wrong option \'headers\' used.');
+ $this->logger->notice('Wrong option \'headers\' used.');
@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
}
curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
}
- $logger = $this->logger;
-
$s = @curl_exec($ch);
$curl_info = @curl_getinfo($ch);
$redirects++;
$this->logger->notice('Curl redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]);
@curl_close($ch);
+ $this->profiler->stopRecording();
return $this->get($curlResponse->getRedirectUrl(), $opts, $redirects);
}
@curl_close($ch);
- $this->profiler->saveTimestamp($stamp1, 'network');
+ $this->profiler->stopRecording();
return $curlResponse;
}
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public function post(string $url, $params, array $headers = [], int $timeout = 0, int &$redirects = 0)
+ public function post(string $url, $params, array $headers = [], int $timeout = 0, &$redirects = 0)
{
- $stamp1 = microtime(true);
+ $this->profiler->startRecording('network');
+
+ if (Network::isLocalLink($url)) {
+ $this->logger->info('Local link', ['url' => $url, 'callstack' => System::callstack(20)]);
+ }
if (Network::isUrlBlocked($url)) {
$this->logger->info('Domain is blocked.' . ['url' => $url]);
+ $this->profiler->stopRecording();
return CurlResult::createErrorCurl($url);
}
$ch = curl_init($url);
if (($redirects > 8) || (!$ch)) {
+ $this->profiler->stopRecording();
return CurlResult::createErrorCurl($url);
}
$redirects++;
$this->logger->info('Post redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]);
curl_close($ch);
+ $this->profiler->stopRecording();
return $this->post($curlResponse->getRedirectUrl(), $params, $headers, $redirects, $timeout);
}
curl_close($ch);
- $this->profiler->saveTimestamp($stamp1, 'network');
+ $this->profiler->stopRecording();
// Very old versions of Lighttpd don't like the "Expect" header, so we remove it when needed
if ($curlResponse->getReturnCode() == 417) {
*/
public function finalUrl(string $url, int $depth = 1, bool $fetchbody = false)
{
+ if (Network::isLocalLink($url)) {
+ $this->logger->info('Local link', ['url' => $url, 'callstack' => System::callstack(20)]);
+ }
+
if (Network::isUrlBlocked($url)) {
$this->logger->info('Domain is blocked.', ['url' => $url]);
return $url;
$url = trim($url, "'");
- $stamp1 = microtime(true);
+ $this->profiler->startRecording('network');
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
$http_code = $curl_info['http_code'];
curl_close($ch);
- $this->profiler->saveTimestamp($stamp1, "network");
+ $this->profiler->stopRecording();
if ($http_code == 0) {
return $url;
return $url;
}
- $stamp1 = microtime(true);
+ $this->profiler->startRecording('network');
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
$body = curl_exec($ch);
curl_close($ch);
- $this->profiler->saveTimestamp($stamp1, "network");
+ $this->profiler->stopRecording();
if (trim($body) == "") {
return $url;
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public function fetch(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
+ public function fetch(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', &$redirects = 0)
{
$ret = $this->fetchFull($url, $timeout, $accept_content, $cookiejar, $redirects);
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public function fetchFull(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
+ public function fetchFull(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', &$redirects = 0)
{
return $this->get(
$url,