Merge branch 'QA_4_6'

This commit is contained in:
Michal Čihař 2016-07-12 10:28:28 +02:00
commit 0ce8cd7919
2 changed files with 6 additions and 0 deletions

View File

@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
- issue #12325 Setup script icons broken
4.6.4 (not yet released)
- issue Include X-Robots-Tag header in responses
4.6.3 (2016-06-23)
- issue #12249 Fixed cookie path on Windows

View File

@ -606,6 +606,11 @@ class Header
header(
'X-Permitted-Cross-Domain-Policies: none'
);
// Robots meta tag
// see https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
header(
'X-Robots-Tag: noindex, nofollow'
);
PMA_noCacheHeader();
if (! defined('IS_TRANSFORMATION_WRAPPER')) {
// Define the charset to be used