gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid unnecessary changes to headers which were set manually by automatic

Browse source 
mime generation


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@16919 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2003-06-14 07:41:29 +00:00
parent f548be891e
commit afbf20bc33
2 changed files with 55 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2003-06-14 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Additions/GSMime.m: Better attempt to infer charset from
string only when needed.
Don't insert transer encoding header if not needed.
2003-06-11 Adam Fedor <fedor@gnu.org>
* Source/NSNumberFormatter.m

81
Source/Additions/GSMime.m
View file

@ -3553,19 +3553,11 @@ static NSCharacterSet *tokenSet = nil;
{
GSMimeHeader *hdr = [self headerNamed: @"content-type"];
NSString *charset = [hdr parameterForKey: @"charset"];
NSStringEncoding enc;
if (charset != nil)
{
NSStringEncoding enc;
enc = [GSMimeDocument encodingFromCharset: charset];
d = [content dataUsingEncoding: enc];
if (d == nil)
{
charset = nil; // String can't be converted to this charset
}
}
if (charset == nil)
enc = [GSMimeDocument encodingFromCharset: charset];
d = [content dataUsingEncoding: enc];
if (d == nil)
{
charset = selectCharacterSet(content, &d);
[hdr setParameter: charset forKey: @"charset"];
@ -3839,7 +3831,7 @@ static NSCharacterSet *tokenSet = nil;
GSMimeHeader *enc;
GSMimeHeader *hdr;
NSData *boundary;
BOOL is7bit = YES;
BOOL contentIs7bit = YES;
unsigned int count;
unsigned int i;
CREATE_AUTORELEASE_POOL(arp);
@ -3874,8 +3866,11 @@ static NSCharacterSet *tokenSet = nil;
/*
* If any part of a multipart document is not 7bit then
* the document as a whole must not be 7bit either.
* It is important tol chack this *after* the part has been
* processed by -rawMimeData:, so we know that the encoding
* set for the part is valid.
*/
if (is7bit == YES)
if (contentIs7bit == YES)
{
NSString *v;
@ -3883,7 +3878,7 @@ static NSCharacterSet *tokenSet = nil;
v = [enc value];
if ([v isEqual: @"8bit"] == YES || [v isEqual: @"binary"] == YES)
{
is7bit = NO;
contentIs7bit = NO;
}
}
}
@ -3921,33 +3916,55 @@ static NSCharacterSet *tokenSet = nil;
if (partData != nil)
{
NSString *v;
BOOL shouldSet;
enc = [self headerNamed: @"content-transfer-encoding"];
v = [enc value];
if (is7bit == NO && [v isEqual: @"7bit"] == YES)
if ([v isEqualToString: @"8bit"] || [v isEqualToString: @"binary"])
{
enc = nil; // Force a reset from 7bit to 8bit
/*
* For 8bit/binary encoding, we can just accept the setting.
*/
shouldSet = NO;
}
if (enc == nil)
{
else if (v == nil || [v isEqualToString: @"7bit"] == YES)
{
/*
* For 7bit encoding, we can accept the setting if the content
* is all 7bit data, otherwise we must change it to 8bit so
* that the content can be handled properly.
*/
if (contentIs7bit == YES)
{
shouldSet = NO;
}
else
{
shouldSet = YES;
}
}
else
{
/*
* A multipart document can't have any other encoding, so we need
* to fix it.
*/
shouldSet = YES;
}
if (shouldSet == YES)
{
/*
* Force a change to the current transfer encoding setting.
*/
enc = [GSMimeHeader alloc];
enc = [enc initWithName: @"content-transfer-encoding"
value: ((is7bit == YES) ? @"7bit" : @"8bit")
value: ((contentIs7bit == YES) ? @"7bit" : @"8bit")
parameters: nil];
[self setHeader: enc];
RELEASE(enc);
}
else
{
if ([v isEqual: @"7bit"] == NO
&& [v isEqual: @"8bit"] == NO
&& [v isEqual: @"binary"] == NO)
{
[NSException raise: NSInternalInconsistencyException
format: @"[%@ -%@] %@ illegal for multipart",
NSStringFromClass([self class]), NSStringFromSelector(_cmd), v];
}
}
v = [type parameterForKey: @"boundary"];
if (v == nil)
{
@ -4056,7 +4073,7 @@ static NSCharacterSet *tokenSet = nil;
GSMimeDocument *part = [content objectAtIndex: i];
NSMutableData *rawPart = [partData objectAtIndex: i];
if (is7bit == YES)
if (contentIs7bit == YES)
{
NSString *v;