Merge branch '3.6RC'

1 files changed, 11 insertions, 8 deletions

diff --git a/install/sample-nginx.conf b/install/sample-nginx.conf
index 4121ff2ec..839f208ae 100644
--- a/install/sample-nginx.conf
+++ b/install/sample-nginx.conf
@@ -73,29 +73,32 @@ server {
   client_max_body_size 20m;
   client_body_buffer_size 128k;
 
+  include mime.types;
+
   # rewrite to front controller as default rule
   location / {
-    if ($is_args != "") {
-        rewrite ^/(.*) /index.php?q=$uri&$args last;
+    if (!-e $request_filename) {
+      rewrite ^(.*)$ /index.php?q=$1;
     }
-    rewrite ^/(.*) /index.php?q=$uri last;
   }
 
   # make sure webfinger and other well known services aren't blocked
   # by denying dot files and rewrite request to the front controller
   location ^~ /.well-known/ {
     allow all;
-    rewrite ^/(.*) /index.php?q=$uri&$args last;
+    if (!-e $request_filename) {
+      rewrite ^(.*)$ /index.php?q=$1;
+    }
   }
 
   # statically serve these file types when possible
   # otherwise fall back to front controller
   # allow browser to cache them
   # added .htm for advanced source code editor library
-  location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|map|ttf|woff|woff2|svg)$ {
-    expires 30d;
-    try_files $uri /index.php?q=$uri&$args;
-  }
+  # location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|map|ttf|woff|woff2|svg)$ {
+  #  expires 30d;
+  #  try_files $uri /index.php?q=$uri&$args;
+  # }
 
   # block these file types
   location ~* \.(tpl|md|tgz|log|out)$ {