From f5678e80cddcebfa6eded61dd1830a1397917305 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Thu, 23 Mar 2006 21:43:33 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=9718 --- checkin_notes | 5 +++++ clientgui/AccountManagerPropertiesPage.cpp | 2 ++ clientgui/ProjectPropertiesPage.cpp | 2 ++ 3 files changed, 9 insertions(+) diff --git a/checkin_notes b/checkin_notes index 6b77f9fa4f..f319c82692 100755 --- a/checkin_notes +++ b/checkin_notes @@ -3164,8 +3164,13 @@ Rom 23 Mar 2006 boinc_exit(ERR_ABORTED_VIA_GUI). - Remove a duplicated class identifier so that the manager will with g++ 4.1 + - Bug Fix: Treat 301 and 302 http status codes as a + get_project_config.php error so that the invalid project page + comes up, instead of the unavailable page. api/ boinc_api.C clientgui/ BOINCTaskBar.h + AccountManagerPropertiesPage.cpp + ProjectPropertiesPage.cpp diff --git a/clientgui/AccountManagerPropertiesPage.cpp b/clientgui/AccountManagerPropertiesPage.cpp index 89408fd792..73a488ab23 100644 --- a/clientgui/AccountManagerPropertiesPage.cpp +++ b/clientgui/AccountManagerPropertiesPage.cpp @@ -307,6 +307,8 @@ void CAccountManagerPropertiesPage::OnStateChange( CAccountManagerPropertiesPage SetProjectPropertiesSucceeded(false); bSuccessfulCondition = (!iReturnValue) && (HTTP_STATUS_NOT_FOUND == pc->error_num) || + (!iReturnValue) && (HTTP_STATUS_MOVED_PERM == pc->error_num) || + (!iReturnValue) && (HTTP_STATUS_MOVED_TEMP == pc->error_num) || (!iReturnValue) && (ERR_GETHOSTBYNAME == pc->error_num) || (!iReturnValue) && (ERR_XML_PARSE == pc->error_num); if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) { diff --git a/clientgui/ProjectPropertiesPage.cpp b/clientgui/ProjectPropertiesPage.cpp index 1d738746df..fc6323e19d 100644 --- a/clientgui/ProjectPropertiesPage.cpp +++ b/clientgui/ProjectPropertiesPage.cpp @@ -445,6 +445,8 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event ) SetProjectPropertiesSucceeded(false); bSuccessfulCondition = (!iReturnValue) && (HTTP_STATUS_NOT_FOUND == pc->error_num) || + (!iReturnValue) && (HTTP_STATUS_MOVED_PERM == pc->error_num) || + (!iReturnValue) && (HTTP_STATUS_MOVED_TEMP == pc->error_num) || (!iReturnValue) && (ERR_GETHOSTBYNAME == pc->error_num) || (!iReturnValue) && (ERR_XML_PARSE == pc->error_num); if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {