X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FCurlResult.php;h=017f2c559f944ae10fa500dff30d3fbaaac3131d;hb=befc2af5043a3afde251721c0d27df695db1bb7e;hp=2f5c94187e82ea7e59dae71802d9830379245cb0;hpb=489510e7a9df2441cac820dc1d8e6b8410050b72;p=friendica.git

diff --git a/src/Network/CurlResult.php b/src/Network/CurlResult.php
index 2f5c94187e..017f2c559f 100644
--- a/src/Network/CurlResult.php
+++ b/src/Network/CurlResult.php
@@ -1,8 +1,28 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Network;
 
 use Friendica\Core\Logger;
+use Friendica\Core\System;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\Network;
 
@@ -111,7 +131,7 @@ class CurlResult
 		$this->errorNumber = $errorNumber;
 		$this->error = $error;
 
-		Logger::log($url . ': ' . $this->returnCode . " " . $result, Logger::DATA);
+		Logger::debug('construct', ['url' => $url, 'returncode' => $this->returnCode, 'result' => $result]);
 
 		$this->parseBodyHeader($result);
 		$this->checkSuccess();
@@ -134,6 +154,7 @@ class CurlResult
 
 		$this->body = substr($result, strlen($header));
 		$this->header = $header;
+		$this->header_fields = []; // Is filled on demand
 	}
 
 	private function checkSuccess()
@@ -146,8 +167,8 @@ class CurlResult
 		}
 
 		if (!$this->isSuccess) {
-			Logger::log('error: ' . $this->url . ': ' . $this->returnCode . ' - ' . $this->error, Logger::INFO);
-			Logger::log('debug: ' . print_r($this->info, true), Logger::DATA);
+			Logger::notice('http error', ['url' => $this->url, 'code' => $this->returnCode, 'error'  => $this->error, 'callstack' => System::callstack(20)]);
+			Logger::debug('debug', ['info' => $this->info]);
 		}
 
 		if (!$this->isSuccess && $this->errorNumber == CURLE_OPERATION_TIMEDOUT) {
@@ -166,7 +187,7 @@ class CurlResult
 		}
 
 		if ($this->returnCode == 301 || $this->returnCode == 302 || $this->returnCode == 303 || $this->returnCode== 307) {
-			$redirect_parts = parse_url(defaults($this->info, 'redirect_url', ''));
+			$redirect_parts = parse_url($this->info['redirect_url'] ?? '');
 			if (empty($redirect_parts)) {
 				$redirect_parts = [];
 			}
@@ -178,7 +199,7 @@ class CurlResult
 				}
 			}
 
-			$parts = parse_url(defaults($this->info, 'url', ''));
+			$parts = parse_url($this->info['url'] ?? '');
 			if (empty($parts)) {
 				$parts = [];
 			}
@@ -248,6 +269,8 @@ class CurlResult
 		if (isset($headers[$field])) {
 			return $headers[$field];
 		}
+
+		return '';
 	}
 
 	/**
@@ -257,7 +280,7 @@ class CurlResult
 	 *
 	 * @return boolean "true" if header exists
 	 */
-	public function headerExists(string $field)
+	public function inHeader(string $field)
 	{
 		$field = strtolower(trim($field));