the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-11-11 01:23:43 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix some performance issues

Browse source
This commit is contained in:
RainLoop Team 2014-06-23 20:14:47 +04:00
parent 5b465f5337
commit 40a0f8b821
5 changed files with 56 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rainloop/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
View file

@ -2272,6 +2272,8 @@ class ImapClient extends \MailSo\Net\NetClient
$this->writeLog('Start Callback for '.$sParent.' / '.$sLiteralAtomUpperCase.
' - try to read '.$iLiteralLen.' bytes.', \MailSo\Log\Enumerations\Type::NOTE);
$this->bRunningCallback = true;
try
{
\call_user_func($this->aFetchCallbacks[$sFetchKey],
@ -2330,6 +2332,8 @@ class ImapClient extends \MailSo\Net\NetClient
}
\MailSo\Base\Loader::IncStatistic('NetRead', $iLiteralLen);
$this->bRunningCallback = false;
}
return $bResult;

24
rainloop/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
View file

@ -18,6 +18,11 @@ abstract class NetClient
*/
protected $bUnreadBuffer;
/**
* @var bool
*/
protected $bRunningCallback;
/**
* @var string
*/
@ -63,6 +68,11 @@ abstract class NetClient
*/
protected $oLogger;
/**
* @var bool
*/
public $__AUTOLOGOUT__;
/**
* @access protected
*/
@ -70,7 +80,10 @@ abstract class NetClient
{
$this->rConnect = null;
$this->bUnreadBuffer = false;
$this->bRunningCallback = false;
$this->oLogger = null;
$this->__AUTOLOGOUT__ = true;
$this->sResponseBuffer = '';
@ -93,7 +106,14 @@ abstract class NetClient
{
try
{
$this->LogoutAndDisconnect();
if ($this->__AUTOLOGOUT__)
{
$this->LogoutAndDisconnect();
}
else
{
$this->Disconnect();
}
}
catch (\Exception $oException) {}
}
@ -257,7 +277,7 @@ abstract class NetClient
*/
public function LogoutAndDisconnect()
{
if (\method_exists($this, 'Logout') && !$this->bUnreadBuffer)
if (\method_exists($this, 'Logout') && !$this->bUnreadBuffer && !$this->bRunningCallback)
{
$this->Logout();
}

4
rainloop/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
View file

@ -407,6 +407,8 @@ class SmtpClient extends \MailSo\Net\NetClient
$this->writeLog('Message data.', \MailSo\Log\Enumerations\Type::NOTE);
$this->bRunningCallback = true;
while (!\feof($rDataStream))
{
$sBuffer = \fgets($rDataStream);
@ -434,6 +436,8 @@ class SmtpClient extends \MailSo\Net\NetClient
$this->sendRequestWithCheck('.', 250);
$this->bRunningCallback = false;
$this->bData = true;
return $this;

23
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -270,6 +270,29 @@ class Actions
return $oResult;
}
/**
* @return void
*/
public function BootStart()
{
if (defined('APP_INSTALLED_START') && defined('APP_INSTALLED_VERSION') &&
APP_INSTALLED_START && !APP_INSTALLED_VERSION)
{
$this->KeenIO('Install');
}
}
/**
* @return void
*/
public function BootEnd()
{
if ($this->MailClient()->IsLoggined())
{
$this->MailClient()->LogoutAndDisconnect();
}
}
/**
* @return string
*/

9
rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
View file

@ -104,14 +104,10 @@ class Service
return $this;
}
$this->oActions->BootStart();
$this->oActions->ParseQueryAuthString();
if (defined('APP_INSTALLED_START') && defined('APP_INSTALLED_VERSION') &&
APP_INSTALLED_START && !APP_INSTALLED_VERSION)
{
$this->oActions->KeenIO('Install');
}
$bCached = false;
$sResult = '';
@ -219,6 +215,7 @@ class Service
echo $sResult;
unset($sResult);
$this->oActions->BootEnd();
return $this;
}