From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 17 Aug 2012 11:16:13 +0000 (+0400)
Subject: api: disable deprecated HTTP parameter support by default
X-Git-Tag: 1.6.0~131
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6eaf31932003b53737c4cd45a50cd29b06955f3f;p=tt-rss.git

api: disable deprecated HTTP parameter support by default
---

diff --git a/api/index.php b/api/index.php
index 770e0978..2d555678 100644
--- a/api/index.php
+++ b/api/index.php
@@ -29,11 +29,17 @@
 
 	$input = file_get_contents("php://input");
 
-	// Override $_REQUEST with JSON-encoded data if available
-	if ($input) {
+	if (defined('_API_DEBUG_HTTP_ENABLED') && _API_DEBUG_HTTP_ENABLED) {
+		// Override $_REQUEST with JSON-encoded data if available
+		// fallback on HTTP parameters
+		if ($input) {
+			$input = json_decode($input, true);
+			if ($input) $_REQUEST = $input;
+		}
+	} else {
+		// Accept JSON only
 		$input = json_decode($input, true);
-
-		if ($input) $_REQUEST = $input;
+		$_REQUEST = $input;
 	}
 
 	if ($_REQUEST["sid"]) {