diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-08-26 05:59:13 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-08-26 05:59:13 -0400 |
| commit | dc9a7714734f9ce69e1e83a80cf40445c59761bf (patch) | |
| tree | a4a6872a32a844cf51e7a8d72b45a96e5342b66f | |
| parent | 0d4089da7fab3c4e2f177ad62bed142d4df181e1 (diff) | |
| parent | 7a36c3b34b82f7470d77e1028375ae14db6874be (diff) | |
| download | forums-dc9a7714734f9ce69e1e83a80cf40445c59761bf.tar forums-dc9a7714734f9ce69e1e83a80cf40445c59761bf.tar.gz forums-dc9a7714734f9ce69e1e83a80cf40445c59761bf.tar.bz2 forums-dc9a7714734f9ce69e1e83a80cf40445c59761bf.tar.xz forums-dc9a7714734f9ce69e1e83a80cf40445c59761bf.zip | |
Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympus
* github-bantu/ticket/10335:
[ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
| -rw-r--r-- | phpBB/feed.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php index 4b1836497b..9816f0f303 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -173,6 +173,12 @@ if (defined('DEBUG_EXTRA') && request_var('explain', 0) && $auth->acl_get('a_')) header("Content-Type: application/atom+xml; charset=UTF-8"); header("Last-Modified: " . gmdate('D, d M Y H:i:s', $feed_updated_time) . ' GMT'); +if (!empty($user->data['is_bot'])) +{ + // Let reverse proxies know we detected a bot. + header('X-PHPBB-IS-BOT: yes'); +} + echo '<?xml version="1.0" encoding="UTF-8"?>' . "\n"; echo '<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="' . $global_vars['FEED_LANG'] . '">' . "\n"; echo '<link rel="self" type="application/atom+xml" href="' . $global_vars['SELF_LINK'] . '" />' . "\n\n"; diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 6b6679bde5..df49bdf637 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4641,6 +4641,12 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 header('Expires: 0'); header('Pragma: no-cache'); + if (!empty($user->data['is_bot'])) + { + // Let reverse proxies know we detected a bot. + header('X-PHPBB-IS-BOT: yes'); + } + return; } |