Merge branch 'MAGETWO-62606' of github.com:magento-east/magento2ce into pr-dev

Sergey Shvets · Sergey Shvets · commit 1c4b5e3d293d · 2016-12-30T10:30:53.000+02:00
diff --git a/nginx.conf.sample b/nginx.conf.sample
@@ -108,7 +108,7 @@ location /static/ {
         expires +1y;
 
         if (!-f $request_filename) {
-            rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
+            rewrite ^/static/?(.*)$ /static.php?resource=$1 last;
         }
     }
     location ~* \.(zip|gz|gzip|bz2|csv|xml)$ {
@@ -117,11 +117,11 @@ location /static/ {
         expires    off;
 
         if (!-f $request_filename) {
-           rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
+           rewrite ^/static/?(.*)$ /static.php?resource=$1 last;
         }
     }
     if (!-f $request_filename) {
-        rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
+        rewrite ^/static/?(.*)$ /static.php?resource=$1 last;
     }
     add_header X-Frame-Options "SAMEORIGIN";
 }

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ location /static/ {`
`108`	`108`	`expires +1y;`
`109`	`109`
`110`	`110`	`if (!-f $request_filename) {`
`111`		`- rewrite ^/static/(version\d/)?(.)$ /static.php?resource=$2 last;`
	`111`	`+ rewrite ^/static/?(.*)$ /static.php?resource=$1 last;`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`location ~* \.(zip\|gz\|gzip\|bz2\|csv\|xml)$ {`
`@@ -117,11 +117,11 @@ location /static/ {`
`117`	`117`	`expires off;`
`118`	`118`
`119`	`119`	`if (!-f $request_filename) {`
`120`		`- rewrite ^/static/(version\d/)?(.)$ /static.php?resource=$2 last;`
	`120`	`+ rewrite ^/static/?(.*)$ /static.php?resource=$1 last;`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`if (!-f $request_filename) {`
`124`		`- rewrite ^/static/(version\d/)?(.)$ /static.php?resource=$2 last;`
	`124`	`+ rewrite ^/static/?(.*)$ /static.php?resource=$1 last;`
`125`	`125`	`}`
`126`	`126`	`add_header X-Frame-Options "SAMEORIGIN";`
`127`	`127`	`}`