Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- client: make "wrong URL" message not be a notice 

- web: fix caching problem when PHP not installed as Apache module

svn path=/trunk/boinc/; revision=22968
This commit is contained in:
David Anderson 2011-02-01 04:43:19 +00:00
parent 924f9fbb1f
commit 229b1373dc
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
checkin_notes
View File

@ -411,3 +411,12 @@ Charlie 31 Jan 2011
GR-ReadMe.rtf GR-ReadMe.rtf
PTP-ReadMe.rtf PTP-ReadMe.rtf
ReadMe.rtf ReadMe.rtf
David 1 Feb 2011
- client: make "wrong URL" message not be a notice
- web: fix caching problem when PHP not installed as Apache module
html/inc/
cache.inc
client/
cs_scheduler.cpp

2
client/cs_scheduler.cpp
View File

@ -525,7 +525,7 @@ int CLIENT_STATE::handle_scheduler_reply(PROJECT* project, char* scheduler_url)
sr.master_url sr.master_url
); );
} else { } else {
msg_printf(project, MSG_USER_ALERT, msg_printf(project, MSG_INFO,
_("You used the wrong URL for this project. When convenient, remove this project, then add %s"), _("You used the wrong URL for this project. When convenient, remove this project, then add %s"),
sr.master_url sr.master_url
); );

4
html/inc/cache.inc
View File

@ -159,6 +159,10 @@ function cache_need_to_regenerate($path, $max_age){
// Returns cached data or false if nothing was found // Returns cached data or false if nothing was found
function get_cached_data($max_age, $params=""){ function get_cached_data($max_age, $params=""){
global $no_cache;
if ($no_cache) return;
$path = get_path($params); $path = get_path($params);
cache_check_diskspace(); cache_check_diskspace();
if ($max_age) { if ($max_age) {