From cc38526f97486a72752bd61d64f17d59c3c02325 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Tue, 12 Jul 2022 13:55:15 +0200 Subject: Fix networking issues Otherwise webfinger requests are not executed correctly Signed-off-by: Carl Schwan --- lib/Controller/LocalController.php | 2 +- lib/Tools/Traits/TNCRequest.php | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php index 12098d37..854c1024 100644 --- a/lib/Controller/LocalController.php +++ b/lib/Controller/LocalController.php @@ -112,7 +112,7 @@ class LocalController extends Controller { * @NoAdminRequired */ public function uploadAttachement(): DataResponse { - + } diff --git a/lib/Tools/Traits/TNCRequest.php b/lib/Tools/Traits/TNCRequest.php index 68f28a9c..b59a540e 100644 --- a/lib/Tools/Traits/TNCRequest.php +++ b/lib/Tools/Traits/TNCRequest.php @@ -184,7 +184,7 @@ trait TNCRequest { if ($request->getType() !== Request::TYPE_GET) { $curl = curl_init($url); } else { - $curl = curl_init($url . '?' . $request->getUrlData()); + $curl = curl_init($url . $request->getQueryString()); } return $curl; @@ -249,8 +249,12 @@ trait TNCRequest { */ private function initRequestHeaders($curl, Request $request) { $headers = $request->getHeaders(); + $headersCurl = []; + foreach ($headers as $name => $value) { + $headersCurl[] = $name . ': ' . $value; + } - curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); + curl_setopt($curl, CURLOPT_HTTPHEADER, $headersCurl); } -- cgit v1.2.3