Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Marius Cramer · Marius Cramer · commit 0e899eee2bf3 · 2015-03-26T17:28:41.000+01:00
diff --git a/install/tpl/nginx_apps.vhost.master b/install/tpl/nginx_apps.vhost.master
@@ -12,7 +12,7 @@ server {
         }
 
         # serve static files directly
-        location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt)$ {
+        location ~* ^.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt)$ {
                access_log        off;
         }
 
diff --git a/install/tpl/nginx_ispconfig.vhost.master b/install/tpl/nginx_ispconfig.vhost.master
@@ -19,7 +19,7 @@ server {
         }
 
         # serve static files directly
-        location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt)$ {
+        location ~* ^.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt)$ {
                access_log        off;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ server {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`# serve static files directly`
`15`		`- location ~* ^.+.(jpg\|jpeg\|gif\|css\|png\|js\|ico\|html\|xml\|txt)$ {`
	`15`	`+ location ~* ^.+\.(jpg\|jpeg\|gif\|css\|png\|js\|ico\|html\|xml\|txt)$ {`
`16`	`16`	`access_log off;`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ server {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`# serve static files directly`
`22`		`- location ~* ^.+.(jpg\|jpeg\|gif\|css\|png\|js\|ico\|html\|xml\|txt)$ {`
	`22`	`+ location ~* ^.+\.(jpg\|jpeg\|gif\|css\|png\|js\|ico\|html\|xml\|txt)$ {`
`23`	`23`	`access_log off;`
`24`	`24`	`}`
`25`	`25`