Merge https://github.com/friendica/red into pending_merge

2015-03-11 15:12:21 -07:00
parent 35fc14d6ab 115f9a4e45
commit 848274bb30
1 changed files with 4 additions and 1 deletions
--- 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