Commit ee5bc5ac authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-707 When truncating AS12+ the general truncation size for the AS2.5

body should not be considered.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 0da01f3a
...@@ -799,6 +799,7 @@ class MAPIProvider { ...@@ -799,6 +799,7 @@ class MAPIProvider {
$transportHeaders = array(PR_TRANSPORT_MESSAGE_HEADERS_W); $transportHeaders = array(PR_TRANSPORT_MESSAGE_HEADERS_W);
$messageHeaders = $this->getProps($mapimessage, $transportHeaders); $messageHeaders = $this->getProps($mapimessage, $transportHeaders);
// this prepends the transport headers to the mime stream
fwrite($message->asbody->data, $messageHeaders[PR_TRANSPORT_MESSAGE_HEADERS] ."\r\n\r\n"); fwrite($message->asbody->data, $messageHeaders[PR_TRANSPORT_MESSAGE_HEADERS] ."\r\n\r\n");
} }
...@@ -2448,8 +2449,7 @@ class MAPIProvider { ...@@ -2448,8 +2449,7 @@ class MAPIProvider {
//only set the truncation size data if device set it in request //only set the truncation size data if device set it in request
if ( $bpo->GetTruncationSize() != false && if ( $bpo->GetTruncationSize() != false &&
$bpReturnType != SYNC_BODYPREFERENCE_MIME && $bpReturnType != SYNC_BODYPREFERENCE_MIME &&
$message->asbody->estimatedDataSize > $bpo->GetTruncationSize() && $message->asbody->estimatedDataSize > $bpo->GetTruncationSize()
$contentparameters->GetTruncation() != SYNC_TRUNCATION_ALL // do not truncate message if the whole is requested, e.g. on fetch
) { ) {
// truncate data stream // truncate data stream
ftruncate($message->asbody->data, $bpo->GetTruncationSize()); ftruncate($message->asbody->data, $bpo->GetTruncationSize());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment