From 9b11001402e57e0cc9b0ef11909c926289c165d1 Mon Sep 17 00:00:00 2001
From: "J. King" <jking@jkingweb.ca>
Date: Mon, 26 Oct 2020 12:57:16 -0400
Subject: [PATCH] Fix sample Nginx configuration

---
 CHANGELOG                                             |  6 ++++++
 UPGRADING                                             | 11 +++++++++++
 dist/nginx.conf                                       |  1 +
 .../030_Web_Server_Configuration.md                   |  1 +
 lib/Arsse.php                                         |  2 +-
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index fe76e0b..da50ceb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+Version 0.8.5 (2020-??-??)
+==========================
+
+Bug fixes:
+- Added the QUERY_STRING FastCGI paramater to the sample Nginx configuration
+
 Version 0.8.4 (2020-09-09)
 ==========================
 
diff --git a/UPGRADING b/UPGRADING
index 42687d7..086a1a5 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -11,6 +11,17 @@ usually prudent:
   `composer install -o --no-dev`
 
 
+Upgrading from 0.8.4 to 0.8.5
+=============================
+
+- The sample configuration for Nginx has changed, to correct the omission of
+  the QUERY_STRING FastCGI parameter in those passed to PHP. The omission
+  affects the Fever protocol in particular (the parameter is required for 
+  Fever to function at all), though it could potentially affect some
+  Nextcloud News clients as well.
+- No significant code changes have been made in this version
+    
+
 Upgrading from 0.8.2 to 0.8.3
 =============================
 
diff --git a/dist/nginx.conf b/dist/nginx.conf
index 6b488d7..c9c7845 100644
--- a/dist/nginx.conf
+++ b/dist/nginx.conf
@@ -19,6 +19,7 @@ server {
         fastcgi_param CONTENT_TYPE    $content_type;
         fastcgi_param CONTENT_LENGTH  $content_length;
         fastcgi_param REQUEST_URI     $uri;
+        fastcgi_param QUERY_STRING    $query_string;
         fastcgi_param HTTPS           $https if_not_empty;
         fastcgi_param REMOTE_USER     $remote_user;
     }
diff --git a/docs/en/020_Getting_Started/030_Web_Server_Configuration.md b/docs/en/020_Getting_Started/030_Web_Server_Configuration.md
index 361624a..679b039 100644
--- a/docs/en/020_Getting_Started/030_Web_Server_Configuration.md
+++ b/docs/en/020_Getting_Started/030_Web_Server_Configuration.md
@@ -30,6 +30,7 @@ server {
         fastcgi_param CONTENT_TYPE    $content_type;
         fastcgi_param CONTENT_LENGTH  $content_length;
         fastcgi_param REQUEST_URI     $uri;
+        fastcgi_param QUERY_STRING    $query_string;
         fastcgi_param HTTPS           $https if_not_empty;
         fastcgi_param REMOTE_USER     $remote_user;
     }
diff --git a/lib/Arsse.php b/lib/Arsse.php
index ef352c5..7d53a42 100644
--- a/lib/Arsse.php
+++ b/lib/Arsse.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
 namespace JKingWeb\Arsse;
 
 class Arsse {
-    public const VERSION = "0.8.4";
+    public const VERSION = "0.8.5";
 
     /** @var Lang */
     public static $lang;