diff --git a/checkin_notes b/checkin_notes
index 0a82d81a87..c98767f458 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6586,3 +6586,12 @@ David 22 June 2007
lib/
parse.C
prefs.C
+
+David 22 June 2007
+ - client: read only first 63KB of stderr.txt
+ - user web: default work_buf_min_days is 0, not ""
+
+ html/inc/
+ prefs.inc
+ client/
+ app_control.C
diff --git a/client/app_control.C b/client/app_control.C
index 772d17ef66..561338c575 100644
--- a/client/app_control.C
+++ b/client/app_control.C
@@ -565,22 +565,19 @@ bool ACTIVE_TASK::read_stderr_file() {
std::string stderr_file;
char path[256];
+ // truncate stderr output to 63KB;
+ // it's unlikely that more than that will be useful
+ //
+ int max_len = 63*1024;
+
sprintf(path, "%s/%s", slot_dir, STDERR_FILE);
- if (boinc_file_exists(path) && !read_file_string(path, stderr_file)) {
- // truncate stderr output to 63KB;
- // it's unlikely that more than that will be useful
- //
- int max_len = 63*1024;
- int len = (int)stderr_file.length();
- if (len > max_len) {
- stderr_file = stderr_file.substr(len-max_len, len);
- }
- result->stderr_out += "\n";
- result->stderr_out += stderr_file;
- result->stderr_out += "\n\n";
- return true;
- }
- return false;
+ if (!boinc_file_exists(path)) return false;
+ if (read_file_string(path, stderr_file, max_len)) return false;
+
+ result->stderr_out += "\n";
+ result->stderr_out += stderr_file;
+ result->stderr_out += "\n\n";
+ return true;
}
// tell a running app to reread project preferences.
diff --git a/doc/index.php b/doc/index.php
index 36aee1a272..9cd4116fd1 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -110,7 +110,7 @@ function show_other() {
- Overview
- Software development
-
- Translation of web and GUI text
+
- Translation of web and GUI text
- Personnel and contributors
- BOINC email lists
- BOINC message boards
diff --git a/doc/versions.inc b/doc/versions.inc
index 94f7d59421..8f69f892b2 100644
--- a/doc/versions.inc
+++ b/doc/versions.inc
@@ -686,7 +686,7 @@ switch(rand(0,5)) {
case 1: $url_base = "http://morel.mit.edu/download/boinc/dl/"; break;
case 2: $url_base = "http://einstein.aei.mpg.de/download/boinc/dl/"; break;
case 3: $url_base = "http://einstein.astro.gla.ac.uk/download/boinc/dl/"; break;
- case 4: $url_base = "http://einstein.aset.psu.edu/download/boinc/dl/"; break;
+ case 4: $url_base = "http://albert.gravity.psu.edu/download/boinc/dl/"; break;
case 5: $url_base = "http://einstein.ligo.caltech.edu/download/boinc/dl/"; break;
//case 6: $url_base = "http://einstein.phys.uwm.edu/download/boinc/dl/"; break;
}
diff --git a/html/inc/prefs.inc b/html/inc/prefs.inc
index cb00b89332..0f0489189c 100644
--- a/html/inc/prefs.inc
+++ b/html/inc/prefs.inc
@@ -393,7 +393,7 @@ function default_prefs_global() {
$p->cpu_scheduling_period_minutes = 60;
$p->confirm_before_connecting = false;
$p->hangup_if_dialed = true;
- $p->work_buf_min_days = "";
+ $p->work_buf_min_days = 0;
$p->work_buf_additional_days = 0.25;
$p->max_cpus = 16;
$p->cpu_usage_limit = 100;