aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar jakem72360 <jakem_5@hotmail.com> 2020-07-04 19:16:09 +1000
committerGravatar GitHub <noreply@github.com> 2020-07-04 11:16:09 +0200
commit45935945443aa76e04eed8524b0973984c3af3ec (patch)
treee74b13fdc811bf31d610ba40a40c5e1b969be343
parentd7d39f07368379e7ef1619e52cc50c0920ce8351 (diff)
Fixed nginx split paths config issue (#3077)
* Fixed nginx split paths config issue * Improved config comments. * s/fixes/see/ * Added link to nginx issue tracker
-rw-r--r--CREDITS.md1
-rw-r--r--docs/en/admins/10_ServerConfig.md5
-rw-r--r--docs/fr/users/01_Installation.md5
3 files changed, 9 insertions, 2 deletions
diff --git a/CREDITS.md b/CREDITS.md
index 39a56fe5a..7eadf3036 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -45,6 +45,7 @@ People are sorted by name so please keep this order.
* [Guillaume Hayot](https://github.com/postblue): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:postblue), [Web](https://postblue.info/)
* [hckweb](https://github.com/hckweb): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=hckweb)
* [hoilc](https://github.com/hoilc): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:hoilc)
+* [Jake Mannens](https://github.com/jakem72360): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:jakem72360)
* [Jan van den Berg](https://github.com/jan-vandenberg): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:jan-vandenberg), [Web](https://j11g.com/)
* [Jaussoin Timothée](https://github.com/edhelas): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=edhelas), [Web](http://edhelas.movim.eu/)
* [jlefler](https://github.com/jlefler): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:jlefler)
diff --git a/docs/en/admins/10_ServerConfig.md b/docs/en/admins/10_ServerConfig.md
index 88387274a..5286023f8 100644
--- a/docs/en/admins/10_ServerConfig.md
+++ b/docs/en/admins/10_ServerConfig.md
@@ -91,7 +91,10 @@ server {
fastcgi_split_path_info ^(.+\.php)(/.*)$;
# By default, the variable PATH_INFO is not set under PHP-FPM
# But FreshRSS API greader.php need it. If you have a “Bad Request” error, double check this var!
- fastcgi_param PATH_INFO $fastcgi_path_info;
+ # NOTE: the separate $path_info variable is required. For more details, see:
+ # https://trac.nginx.org/nginx/ticket/321
+ set $path_info $fastcgi_path_info;
+ fastcgi_param PATH_INFO $path_info;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
}
diff --git a/docs/fr/users/01_Installation.md b/docs/fr/users/01_Installation.md
index 9c5022f17..2f31e4c77 100644
--- a/docs/fr/users/01_Installation.md
+++ b/docs/fr/users/01_Installation.md
@@ -119,7 +119,10 @@ server {
fastcgi_split_path_info ^(.+\.php)(/.*)$;
# Par défaut la variable PATH_INFO n’est pas définie sous PHP-FPM
# or l’API FreshRSS greader.php en a besoin. Si vous avez un “Bad Request”, vérifiez bien cette dernière !
- fastcgi_param PATH_INFO $fastcgi_path_info;
+ # REMARQUE : l'utilisation de la variable $path_info est requis. Pour plus de détails, voir :
+ # https://trac.nginx.org/nginx/ticket/321
+ set $path_info $fastcgi_path_info;
+ fastcgi_param PATH_INFO $path_info;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
}