aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-11 19:35:23 -0700
committerfriendica <info@friendica.com>2015-03-11 19:35:23 -0700
commit64ae17aa6a1bdbc3933422272a391d4e3662f59b (patch)
treeb87f4c0866d9ecfa832d43b7e622e3100386a408 /doc
parenta40c19d19d31bba3fe037a9778c521461e2b0290 (diff)
parentb3a9a6c802170a15cc58fd3af966b35f81c50818 (diff)
downloadvolse-hubzilla-64ae17aa6a1bdbc3933422272a391d4e3662f59b.tar.gz
volse-hubzilla-64ae17aa6a1bdbc3933422272a391d4e3662f59b.tar.bz2
volse-hubzilla-64ae17aa6a1bdbc3933422272a391d4e3662f59b.zip
Merge branch 'master' into openid
Diffstat (limited to 'doc')
-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