adjustment for new java download method

see http://forum.yacy-websuche.de/viewtopic.php?p=20616#p20616

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7081 6c8d7289-2bf4-0310-a012-ef5d649a1542

addon/download.php

@@ -4,6 +4,8 @@ This file serves the latest Java version locations for the Windows installer.
 
 JAVA VERSION
 http://www.java.com/de/download/manual.jsp BundleId +1 / +2
+Use this User-Agent to see the 64bit version link:
+Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Win64; x64; Trident/4.0)
 
 $_GET['what']		should be 'jre'
 $_GET['version']	32 or 64 (bit)
@@ -15,12 +17,12 @@ $_GET['yacyrevnr']	not used yet
 if ($_GET['what'] == 'jre') {
 	
 	if($_GET['version'] == 32)
-		// jre-6u18-windows-i586.exe
-		header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=37718');
+		// jre-6u21-windows-i586.exe
+		header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=41724');
 
 	if($_GET['version'] == 64)
-		// jre-6u18-windows-x64.exe
-		header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=37401');
+		// jre-6u21-windows-x64.exe
+		header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=41293');
 
 }
 

build.nsi

@@ -47,10 +47,10 @@ SetCompressor /SOLID LZMA
 ; http://www.java.com/de/download/manual.jsp BundleId +1 / +2
 
 !define JRE_VERSION6 "1.6"
-!define JRE_32 "http://javadl.sun.com/webapps/download/AutoDL?BundleId=37718" ;jre-6u18-windows-i586.exe
-!define JRE_64 "http://javadl.sun.com/webapps/download/AutoDL?BundleId=37401" ;jre-6u18-windows-x64.exe
-;!define JRE_32 "http://yacyweb.de/download.php?what=jre&version=32&yacyrevnr=@REPL_REVISION_NR@"
-;!define JRE_64 "http://yacyweb.de/download.php?what=jre&version=64&yacyrevnr=@REPL_REVISION_NR@"
+;!define JRE_32 "http://javadl.sun.com/webapps/download/AutoDL?BundleId=37718" ;jre-6u18-windows-i586.exe
+;!define JRE_64 "http://javadl.sun.com/webapps/download/AutoDL?BundleId=37401" ;jre-6u18-windows-x64.exe
+!define JRE_32 "http://yacy.berlios.de/download.php?what=jre&version=32&yacyrevnr=@REPL_REVISION_NR@"
+!define JRE_64 "http://yacy.berlios.de/download.php?what=jre&version=64&yacyrevnr=@REPL_REVISION_NR@"
 
 ; ----------------------------------------
 ; GENERAL APPEARANCE