Fix for incorrectly batching up more mail after EOB, if MULTIBATCH is not agreed
This commit is contained in:
parent
5516b5dc23
commit
b37c6407fb
@ -371,7 +371,7 @@ class Packet extends FTNBase implements \Iterator, \Countable
|
|||||||
*/
|
*/
|
||||||
public function addressHeader(Address $oo,Address $o): void
|
public function addressHeader(Address $oo,Address $o): void
|
||||||
{
|
{
|
||||||
Log::debug(sprintf('%s:Creating packet [%s]',self::LOGKEY,$this->name));
|
Log::debug(sprintf('%s:+ Creating packet for [%s]',self::LOGKEY,$o->ftn));
|
||||||
|
|
||||||
$date = Carbon::now();
|
$date = Carbon::now();
|
||||||
|
|
||||||
|
@ -797,8 +797,7 @@ final class Binkp extends BaseProtocol
|
|||||||
$this->sessionSet(self::SE_RECVEOB);
|
$this->sessionSet(self::SE_RECVEOB);
|
||||||
$this->sessionClear(self::SE_DELAYEOB);
|
$this->sessionClear(self::SE_DELAYEOB);
|
||||||
|
|
||||||
// @todo Is this multibatch mode, if so we should check that MB hasn been agreed.
|
if (! $this->send->total_count && $this->sessionGet(self::SE_NOFILES) && $this->capGet(self::F_MULTIBATCH,self::O_WE)) {
|
||||||
if (! $this->send->total_count && $this->sessionGet(self::SE_NOFILES)) {
|
|
||||||
// Add our mail to the queue if we have authenticated
|
// Add our mail to the queue if we have authenticated
|
||||||
if ($this->node->aka_authed)
|
if ($this->node->aka_authed)
|
||||||
foreach ($this->node->aka_remote_authed as $ao) {
|
foreach ($this->node->aka_remote_authed as $ao) {
|
||||||
|
Loading…
Reference in New Issue
Block a user