From 8af80091c74bfc406839bf5b7ed28c143fda2d5e Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 14 Jun 2017 11:04:00 +0200 Subject: [PATCH 1/2] file_get_contents fix PHP 7.1 https://github.com/FreshRSS/FreshRSS/issues/1584 --- p/api/greader.php | 2 +- p/api/pshb.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/p/api/greader.php b/p/api/greader.php index e1f4202a7..262f9d0fa 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -23,7 +23,7 @@ Server-side API compatible with Google Reader API layer 2 require('../../constants.php'); require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader -$ORIGINAL_INPUT = file_get_contents('php://input', false, null, -1, 1048576); +$ORIGINAL_INPUT = file_get_contents('php://input', false, null, 0, 1048576); if (PHP_INT_SIZE < 8) { //32-bit function dec2hex($dec) { diff --git a/p/api/pshb.php b/p/api/pshb.php index 4b546908a..ed8326cf5 100644 --- a/p/api/pshb.php +++ b/p/api/pshb.php @@ -11,7 +11,7 @@ function logMe($text) { file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND); } -$ORIGINAL_INPUT = file_get_contents('php://input', false, null, -1, MAX_PAYLOAD); +$ORIGINAL_INPUT = file_get_contents('php://input', false, null, 0, MAX_PAYLOAD); //logMe(print_r(array('_SERVER' => $_SERVER, '_GET' => $_GET, '_POST' => $_POST, 'INPUT' => $ORIGINAL_INPUT), true)); From 9f936b549b466d5dfe415a137572093356647ca2 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Tue, 20 Jun 2017 09:10:48 +0200 Subject: [PATCH 2/2] Changelog 1584 https://github.com/FreshRSS/FreshRSS/issues/1584 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21459f32d..c66c552a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,12 @@ ## 2017-XX-XX FreshRSS 1.7.1-dev +* Bug fixing + * PHP 7.1 compatibility for the API [#1584](https://github.com/FreshRSS/FreshRSS/issues/1584) + ## 2017-06-03 FreshRSS 1.7.0 + * Features: * Deferred insertion of new articles, for better chronological order [#530](https://github.com/FreshRSS/FreshRSS/issues/530) * Better search: