wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-22 07:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1404049 - fix that mail.imap.use_literal_plus set to false may have no effect.

Browse source 
This is because it was only used in response to a CAPABILITY imap request. However, often CAPABILITY response occurs without a request so TB sees no need to do a request. Fix by moving the usage of use_literal_plus to where LITERAL+ capability is actually used.

Tag #1273
This commit is contained in:
Matt A. Tobin 2019-11-10 18:06:51 -05:00 • committed by Roy Tam
commit f7f211f424
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
mailnews/imap/src/nsImapProtocol.cpp
View file

@ -5418,14 +5418,6 @@ void nsImapProtocol::Capability()
nsresult rv = SendData(command.get()); nsresult rv = SendData(command.get());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
ParseIMAPandCheckForNewMail(); ParseIMAPandCheckForNewMail();
if (!gUseLiteralPlus)
{
eIMAPCapabilityFlags capabilityFlag = GetServerStateParser().GetCapabilityFlag();
if (capabilityFlag & kLiteralPlusCapability)
{
GetServerStateParser().SetCapabilityFlag(capabilityFlag & ~kLiteralPlusCapability);
}
}
} }
void nsImapProtocol::ID() void nsImapProtocol::ID()
@ -6091,8 +6083,6 @@ void nsImapProtocol::UploadMessageFromFile (nsIFile* file,
nsresult rv; nsresult rv;
bool eof = false; bool eof = false;
nsCString flagString; nsCString flagString;
bool hasLiteralPlus = (GetServerStateParser().GetCapabilityFlag() &
kLiteralPlusCapability);
nsCOMPtr <nsIInputStream> fileInputStream; nsCOMPtr <nsIInputStream> fileInputStream;
@ -6155,7 +6145,13 @@ void nsImapProtocol::UploadMessageFromFile (nsIFile* file,
rv = NS_NewLocalFileInputStream(getter_AddRefs(fileInputStream), file); rv = NS_NewLocalFileInputStream(getter_AddRefs(fileInputStream), file);
if (NS_FAILED(rv) || !fileInputStream) goto done; if (NS_FAILED(rv) || !fileInputStream) goto done;
command.AppendInt((int32_t)fileSize); command.AppendInt((int32_t)fileSize);
if (hasLiteralPlus)
// Set useLiteralPlus to true if server has capability LITERAL+ and
// LITERAL+ useage is enabled in the config editor,
// i.e., "mail.imap.use_literal_plus" = true.
bool useLiteralPlus = (GetServerStateParser().GetCapabilityFlag() &
kLiteralPlusCapability) && gUseLiteralPlus;
if (useLiteralPlus)
command.Append("+}" CRLF); command.Append("+}" CRLF);
else else
command.Append("}" CRLF); command.Append("}" CRLF);
@ -6163,7 +6159,7 @@ void nsImapProtocol::UploadMessageFromFile (nsIFile* file,
rv = SendData(command.get()); rv = SendData(command.get());
if (NS_FAILED(rv)) goto done; if (NS_FAILED(rv)) goto done;
if (!hasLiteralPlus) if (!useLiteralPlus)
ParseIMAPandCheckForNewMail(); ParseIMAPandCheckForNewMail();
totalSize = fileSize; totalSize = fileSize;