From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 3 Apr 2013 09:43:09 +0000 (+0400)
Subject: add NO_CURL; disable native gzdecoding for file_get_contents() experimentally
X-Git-Tag: 1.7.7~14
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6470aaec68ef3dff6aa990d496f5eae8b779dd0a;p=tt-rss.git

add NO_CURL; disable native gzdecoding for file_get_contents() experimentally
---

diff --git a/include/functions.php b/include/functions.php
index d77cb199..aa1f0808 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -318,7 +318,7 @@
 		global $fetch_last_error;
 		global $fetch_last_error_code;
 
-		if (function_exists('curl_init') && !ini_get("open_basedir")) {
+		if (!defined('NO_CURL') && !function_exists('curl_init') && !ini_get("open_basedir")) {
 
 			if (ini_get("safe_mode")) {
 				$ch = curl_init(geturl($url));
@@ -397,9 +397,6 @@
 
 			$data = @file_get_contents($url);
 
-			@$gzdecoded = gzdecode($data);
-			if ($gzdecoded) $data = $gzdecoded;
-
 			if (!$data && function_exists('error_get_last')) {
 				$error = error_get_last();
 				$fetch_last_error = $error["message"];