X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FHTTPRequest.php;h=6442295273857e7af78df608b614f9e97e30fa22;hb=335cd76baf1cf4352e56f779c898118eb9f36ff1;hp=79419d38e25fbe581504ce2e963e6e68f1354e7f;hpb=998c83eacbbf96e1aebe8bae225738fd2b8d6a71;p=friendica.git

diff --git a/src/Network/HTTPRequest.php b/src/Network/HTTPRequest.php
index 79419d38e2..6442295273 100644
--- a/src/Network/HTTPRequest.php
+++ b/src/Network/HTTPRequest.php
@@ -59,7 +59,7 @@ class HTTPRequest implements IHTTPRequest
 	 *
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public function get(string $url, bool $binary = false, array $opts = [], int &$redirects = 0)
+	public function get(string $url, array $opts = [], int &$redirects = 0)
 	{
 		$stamp1 = microtime(true);
 
@@ -172,12 +172,7 @@ class HTTPRequest implements IHTTPRequest
 			curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 		}
 
-		if ($binary) {
-			@curl_setopt($ch, CURLOPT_BINARYTRANSFER, 1);
-		}
-
-		// don't let curl abort the entire application
-		// if it throws any errors.
+		$logger = $this->logger;
 
 		$s         = @curl_exec($ch);
 		$curl_info = @curl_getinfo($ch);
@@ -192,11 +187,11 @@ class HTTPRequest implements IHTTPRequest
 
 		$curlResponse = new CurlResult($url, $s, $curl_info, curl_errno($ch), curl_error($ch));
 
-		if ($curlResponse->isRedirectUrl()) {
+		if (!Network::isRedirectBlocked($url) && $curlResponse->isRedirectUrl()) {
 			$redirects++;
 			$this->logger->notice('Curl redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]);
 			@curl_close($ch);
-			return $this->get($curlResponse->getRedirectUrl(), $binary, $opts, $redirects);
+			return $this->get($curlResponse->getRedirectUrl(), $opts, $redirects);
 		}
 
 		@curl_close($ch);
@@ -280,7 +275,7 @@ class HTTPRequest implements IHTTPRequest
 
 		$curlResponse = new CurlResult($url, $s, $curl_info, curl_errno($ch), curl_error($ch));
 
-		if ($curlResponse->isRedirectUrl()) {
+		if (!Network::isRedirectBlocked($url) && $curlResponse->isRedirectUrl()) {
 			$redirects++;
 			$this->logger->info('Post redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]);
 			curl_close($ch);
@@ -321,6 +316,11 @@ class HTTPRequest implements IHTTPRequest
 			return $url;
 		}
 
+		if (Network::isRedirectBlocked($url)) {
+			$this->logger->info('Domain should not be redirected.', ['url' => $url]);
+			return $url;
+		}
+
 		$url = Network::stripTrackingQueryParams($url);
 
 		if ($depth > 10) {
@@ -430,9 +430,9 @@ class HTTPRequest implements IHTTPRequest
 	 *
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public function fetch(string $url, bool $binary = false, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
+	public function fetch(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
 	{
-		$ret = $this->fetchFull($url, $binary, $timeout, $accept_content, $cookiejar, $redirects);
+		$ret = $this->fetchFull($url, $timeout, $accept_content, $cookiejar, $redirects);
 
 		return $ret->getBody();
 	}
@@ -444,11 +444,10 @@ class HTTPRequest implements IHTTPRequest
 	 *
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public function fetchFull(string $url, bool $binary = false, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
+	public function fetchFull(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
 	{
 		return $this->get(
 			$url,
-			$binary,
 			[
 				'timeout'        => $timeout,
 				'accept_content' => $accept_content,