From f4055357303c923eec7eeca10e880e9e2f7c14bc Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 13 Aug 2008 12:31:19 +0000
Subject: [PATCH] merge

git-svn-id: file:///svn/phpbb/trunk@8746 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/download/file.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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