aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-08-26 05:59:34 -0400
committerNils Adermann <naderman@naderman.de>2011-08-26 05:59:34 -0400
commit2219193096e35bf5b27ef838bb9f7920ffab3532 (patch)
tree2039ca737d44db2bee5c76a624a00af3bdc641ad /phpBB/includes
parent73aca1a6fb72137befa6b61fba402ebe5e2babe1 (diff)
parentdc9a7714734f9ce69e1e83a80cf40445c59761bf (diff)
downloadforums-2219193096e35bf5b27ef838bb9f7920ffab3532.tar
forums-2219193096e35bf5b27ef838bb9f7920ffab3532.tar.gz
forums-2219193096e35bf5b27ef838bb9f7920ffab3532.tar.bz2
forums-2219193096e35bf5b27ef838bb9f7920ffab3532.tar.xz
forums-2219193096e35bf5b27ef838bb9f7920ffab3532.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index a118af0396..47ff270b76 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4584,6 +4584,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;
}