[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-269-g9ae7a24

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 9ae7a243021a0797ecdcb891f49ff7330b623c93
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jun 12 21:57:06 2011 +0200

    Avoiding PHP error message with key access in $GET

diff --git a/debian/patches/series b/debian/patches/series
index faf6a60..74f5bc1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ csh2tcsh.patch
 file_upload_handler_permission.patch
 upstream_sztaki_usingTempfileInUpdateVersions.patch
 upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
+upstream_sztaki_ProperArrayPhpIndexCheck_JobTimes.patch
diff --git a/debian/patches/upstream_sztaki_ProperArrayPhpIndexCheck_JobTimes.patch b/debian/patches/upstream_sztaki_ProperArrayPhpIndexCheck_JobTimes.patch
new file mode 100644
index 0000000..71639d6
--- /dev/null
+++ b/debian/patches/upstream_sztaki_ProperArrayPhpIndexCheck_JobTimes.patch
@@ -0,0 +1,22 @@
+Index: boinc/html/ops/job_times.php
+===================================================================
+--- boinc.orig/html/ops/job_times.php	2011-06-12 21:52:01.000000000 +0200
++++ boinc/html/ops/job_times.php	2011-06-12 21:56:15.000000000 +0200
+@@ -205,11 +205,16 @@
+ 
+ if (get_str('submit', true)=='OK') {
+     set_time_limit(0);
+-    $appid = $_GET['appid'];
++
++    $appid=0;
++    if (!array_key_exists('appid',$_GET)) {
++        $appid = $_GET['appid'];
++    }
+     if (!$appid) {
+         echo "Must supply an appid";
+         exit;
+     }
++
+     $platformid = $_GET['platformid'];
+     $quantum = $_GET['quantum'];
+     $nresults = $_GET['nresults'];

-- 
BOINC packaging