Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

Till Brehm · Till Brehm · commit e5c16541015e · 2017-09-25T14:03:31.000+02:00
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
@@ -131,6 +131,8 @@ server {
         location = /favicon.ico {
             log_not_found off;
             access_log off;
+            expires max;
+            add_header Cache-Control "public, must-revalidate, proxy-revalidate";
         }
 
         location = /robots.txt {

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,8 @@ server {`
`131`	`131`	`location = /favicon.ico {`
`132`	`132`	`log_not_found off;`
`133`	`133`	`access_log off;`
	`134`	`+ expires max;`
	`135`	`+ add_header Cache-Control "public, must-revalidate, proxy-revalidate";`
`134`	`136`	`}`
`135`	`137`
`136`	`138`	`location = /robots.txt {`