Refactor dynamic App::getProfiler() to static DI::profiler()

[friendica.git] / src / Util / Network.php

diff --git a/src/Util/Network.php b/src/Util/Network.php
index 7e1012827e4dac297bd7af46f3710c5bc13f6bd7..b19c8af50499c93a3942b345551913822ae89633 100644 (file)
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -10,6 +10,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
+use Friendica\DI;
 use Friendica\Network\CurlResult;
 
 class Network
@@ -233,7 +234,7 @@ class Network
 
                @curl_close($ch);
 
-               $a->getProfiler()->saveTimestamp($stamp1, 'network', System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, 'network', System::callstack());
 
                return $curlResponse;
        }
@@ -285,16 +286,6 @@ class Network
                        curl_setopt($ch, CURLOPT_TIMEOUT, intval($curl_time));
                }
 
-               if (defined('LIGHTTPD')) {
-                       if (empty($headers)) {
-                               $headers = ['Expect:'];
-                       } else {
-                               if (!in_array('Expect:', $headers)) {
-                                       array_push($headers, 'Expect:');
-                               }
-                       }
-               }
-
                if (!empty($headers)) {
                        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
                }
@@ -335,7 +326,22 @@ class Network
 
                curl_close($ch);
 
-               $a->getProfiler()->saveTimestamp($stamp1, 'network', System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, 'network', System::callstack());
+
+               // Very old versions of Lighttpd don't like the "Expect" header, so we remove it when needed
+               if ($curlResponse->getReturnCode() == 417) {
+                       $redirects++;
+
+                       if (empty($headers)) {
+                               $headers = ['Expect:'];
+                       } else {
+                               if (!in_array('Expect:', $headers)) {
+                                       array_push($headers, 'Expect:');
+                               }
+                       }
+                       Logger::info('Server responds with 417, applying workaround', ['url' => $url]);
+                       return self::post($url, $params, $headers, $redirects, $timeout);
+               }
 
                Logger::log('post_url: end ' . $url, Logger::DATA);
 
@@ -649,7 +655,7 @@ class Network
                $http_code = $curl_info['http_code'];
                curl_close($ch);
 
-               $a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "network", System::callstack());
 
                if ($http_code == 0) {
                        return $url;
@@ -691,7 +697,7 @@ class Network
                $body = curl_exec($ch);
                curl_close($ch);
 
-               $a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "network", System::callstack());
 
                if (trim($body) == "") {
                        return $url;