gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-30 20:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

'=' still special for http

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13734 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-05-29 16:56:58 +00:00
parent 16c1b72600
commit c2e8269b29
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Source/Additions/GSMime.m
View file

@ -58,8 +58,8 @@ static unsigned _count = 0;
static NSString *makeUniqueString(); static NSString *makeUniqueString();
static NSCharacterSet *whitespace = nil; static NSCharacterSet *whitespace = nil;
static NSCharacterSet *rfc822specials = nil; static NSCharacterSet *httpSpecials = nil;
static NSCharacterSet *rfc2045specials = nil; static NSCharacterSet *rfc2045Specials = nil;
/* /*
* Name - decodebase64() * Name - decodebase64()
@ -1220,7 +1220,6 @@ parseCharacterSet(NSString *token)
NSString *name; NSString *name;
NSString *value; NSString *value;
GSMimeHeader *info; GSMimeHeader *info;
NSCharacterSet *skip;
info = AUTORELEASE([GSMimeHeader new]); info = AUTORELEASE([GSMimeHeader new]);
@ -1251,11 +1250,7 @@ parseCharacterSet(NSString *token)
[info setName: name]; [info setName: name];
name = [info name]; name = [info name];
skip = RETAIN([scanner charactersToBeSkipped]); [self scanPastSpace: scanner];
[scanner setCharactersToBeSkipped: nil];
[scanner scanCharactersFromSet: skip intoString: 0];
[scanner setCharactersToBeSkipped: skip];
RELEASE(skip);
/* /*
* Break header fields out into info dictionary. * Break header fields out into info dictionary.
@ -1606,11 +1601,11 @@ parseCharacterSet(NSString *token)
if (isHttp == YES) if (isHttp == YES)
{ {
specials = rfc822specials; specials = httpSpecials;
} }
else else
{ {
specials = rfc2045specials; specials = rfc2045Specials;
} }
/* /*
* Now return token delimiter (may be whitespace) * Now return token delimiter (may be whitespace)
@ -1719,11 +1714,11 @@ parseCharacterSet(NSString *token)
if (isHttp == YES) if (isHttp == YES)
{ {
specials = rfc822specials; specials = httpSpecials;
} }
else else
{ {
specials = rfc2045specials; specials = rfc2045Specials;
} }
/* /*
@ -2654,19 +2649,19 @@ static NSCharacterSet *tokenSet = nil;
[m formUnionWithCharacterSet: [m formUnionWithCharacterSet:
[NSCharacterSet characterSetWithCharactersInString: [NSCharacterSet characterSetWithCharactersInString:
@".()<>@,;:[]\"\\"]]; @".()<>@,;:[]\"\\="]];
[m formUnionWithCharacterSet: [m formUnionWithCharacterSet:
[NSCharacterSet whitespaceAndNewlineCharacterSet]]; [NSCharacterSet whitespaceAndNewlineCharacterSet]];
[m formUnionWithCharacterSet: [m formUnionWithCharacterSet:
[NSCharacterSet controlCharacterSet]]; [NSCharacterSet controlCharacterSet]];
[m formUnionWithCharacterSet: [m formUnionWithCharacterSet:
[NSCharacterSet illegalCharacterSet]]; [NSCharacterSet illegalCharacterSet]];
rfc822specials = [m copy]; httpSpecials = [m copy];
[m formUnionWithCharacterSet: [m formUnionWithCharacterSet:
[NSCharacterSet characterSetWithCharactersInString: [NSCharacterSet characterSetWithCharactersInString:
@"/?="]]; @"/?"]];
[m removeCharactersInString: @"."]; [m removeCharactersInString: @"."];
rfc2045specials = [m copy]; rfc2045Specials = [m copy];
whitespace = RETAIN([NSCharacterSet whitespaceAndNewlineCharacterSet]); whitespace = RETAIN([NSCharacterSet whitespaceAndNewlineCharacterSet]);
} }
} }