aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-11 15:12:21 -0700
committerfriendica <info@friendica.com>2015-03-11 15:12:21 -0700
commit848274bb30add2d3ebee868cb2352f6ab182bccd (patch)
treeb0f032604fefd0380b7980fee0be20d38c14e412
parent35fc14d6ab286a20bc8c510733c46cbd5f0d9676 (diff)
parent115f9a4e4570caf53ee042be9690bb7342ee9e90 (diff)
downloadvolse-hubzilla-848274bb30add2d3ebee868cb2352f6ab182bccd.tar.gz
volse-hubzilla-848274bb30add2d3ebee868cb2352f6ab182bccd.tar.bz2
volse-hubzilla-848274bb30add2d3ebee868cb2352f6ab182bccd.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--doc/install/sample-nginx.conf5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/install/sample-nginx.conf b/doc/install/sample-nginx.conf
index f533d8ee0..c1e5663a8 100644
--- a/doc/install/sample-nginx.conf
+++ b/doc/install/sample-nginx.conf
@@ -75,7 +75,10 @@ server {
# rewrite to front controller as default rule
location / {
- rewrite ^/(.*) /index.php?q=$uri&$args last;
+ if ($is_args != "") {
+ rewrite ^/(.*) /index.php?q=$uri&$args last;
+ }
+ rewrite ^/(.*) /index.php?q=$uri last;
}
# make sure webfinger and other well known services aren't blocked