extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 10:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

* eMail/Activesync: improve behavior on connection failure. Return 503 Service unavailable/Retry After on Connection error.

Browse Source 
Exception that was thrown previously after the 503 header did overwrite the 503 header with a 500 header (so now we should have the behavior as intended)
This commit is contained in:
Klaus Leithoff 2013-07-23 07:16:22 +00:00
parent 4619a9f9c6
commit c0d040342b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
felamimail/inc/class.felamimail_activesync.inc.php
View File

@ -324,6 +324,8 @@ class felamimail_activesync implements activesync_plugin_write, activesync_plugi
{ {
header("HTTP/1.1 500 Internal Server Error"); header("HTTP/1.1 500 Internal Server Error");
$waitOnFailure[self::$profileID] = array('howlong'=>$this->waitOnFailureDefault,'lastattempt'=>$hereandnow); $waitOnFailure[self::$profileID] = array('howlong'=>$this->waitOnFailureDefault,'lastattempt'=>$hereandnow);
egw_cache::setCache(egw_cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($GLOBALS['egw_info']['user']['account_id']),$waitOnFailure,$expiration=60*60*2);
throw new egw_exception_not_found(__METHOD__."($account) can not open connection on Profile #".self::$profileID."!");
} }
else else
{ {
@ -331,10 +333,11 @@ class felamimail_activesync implements activesync_plugin_write, activesync_plugi
header("HTTP/1.1 503 Service Unavailable"); header("HTTP/1.1 503 Service Unavailable");
header("Retry-After: ".$waitOnFailure[self::$profileID]['howlong']); header("Retry-After: ".$waitOnFailure[self::$profileID]['howlong']);
$waitOnFailure[self::$profileID] = array('howlong'=>$waitOnFailure[self::$profileID]['howlong'] * 2,'lastattempt'=>$hereandnow); $waitOnFailure[self::$profileID] = array('howlong'=>$waitOnFailure[self::$profileID]['howlong'] * 2,'lastattempt'=>$hereandnow);
$ethrown = new egw_exception_not_found(__METHOD__."($account) can not open connection on Profile #".self::$profileID."!");
_egw_log_exception($ethrown);
exit;
} }
//die('Mail not or mis-configured!'); //die('Mail not or mis-configured!');
egw_cache::setCache(egw_cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($GLOBALS['egw_info']['user']['account_id']),$waitOnFailure,$expiration=60*60*2);
throw new egw_exception_not_found(__METHOD__."($account) can not open connection on Profile #".self::$profileID."!");
} }
else else
{ {