Compare commits

...

2 Commits

2 changed files with 16 additions and 2 deletions

View File

@ -28,7 +28,13 @@ class CompressedString implements CastsAttributes
? stream_get_contents($value)
: $value;
return $value ? zstd_uncompress(base64_decode($value)) : '';
// If we get an error decompressing, it might not be zstd (or its already been done)
try {
return $value ? zstd_uncompress(base64_decode($value)) : '';
} catch (\ErrorException $e) {
return $value;
}
}
/**

View File

@ -116,8 +116,12 @@ class MessageProcess implements ShouldQueue
$o->cost = $this->msg->cost;
$o->msgid = $this->msg->msgid;
$o->tagline = $this->msg->tagline;
$o->tearline = $this->msg->tearline;
$o->origin = $this->msg->origin;
$o->subject = $this->msg->subject;
$o->msg = $this->msg->message;
$o->msg = $this->msg->message_src."\r";
foreach ($this->msg->via as $v)
$o->msg .= sprintf("\01Via %s\r",$v);
@ -372,6 +376,10 @@ class MessageProcess implements ShouldQueue
$o->msgid = $this->msg->msgid;
$o->replyid = $this->msg->replyid;
$o->tagline = $this->msg->tagline;
$o->tearline = $this->msg->tearline;
$o->origin = $this->msg->origin;
$o->msg = $this->msg->message_src."\r";
$o->msg_src = $this->msg->message_src;
$o->msg_crc = md5($this->msg->message);