aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-08-13 12:31:19 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-08-13 12:31:19 +0000
commitf4055357303c923eec7eeca10e880e9e2f7c14bc (patch)
treef74338a6a272834578749a305103c3e951c8d772
parent6eed0e5bd2ace03c027a6c02ca3af3f0cde6cb58 (diff)
downloadforums-f4055357303c923eec7eeca10e880e9e2f7c14bc.tar
forums-f4055357303c923eec7eeca10e880e9e2f7c14bc.tar.gz
forums-f4055357303c923eec7eeca10e880e9e2f7c14bc.tar.bz2
forums-f4055357303c923eec7eeca10e880e9e2f7c14bc.tar.xz
forums-f4055357303c923eec7eeca10e880e9e2f7c14bc.zip
merge
git-svn-id: file:///svn/phpbb/trunk@8746 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/download/file.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 3a0a7c5886..1616448c0b 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -16,6 +16,18 @@ if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './../');
if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
+if (isset($_SERVER['CONTENT_TYPE']))
+{
+ if ($_SERVER['CONTENT_TYPE'] === 'application/x-java-archive')
+ {
+ exit;
+ }
+}
+else if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], 'Java') !== false)
+{
+ exit;
+}
+
if (isset($_GET['avatar']))
{
// worst-case default