mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 16:30:41 +00:00
Use -mimeDocument method rather than -document
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13716 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
4a42e431f2
commit
856ecc2631
2 changed files with 19 additions and 6 deletions
|
@ -344,7 +344,7 @@ parseCharacterSet(NSString *token)
|
|||
}
|
||||
if ([parser isComplete] == YES)
|
||||
{
|
||||
newDocument = [parser document];
|
||||
newDocument = [parser mimeDocument];
|
||||
RETAIN(newDocument);
|
||||
}
|
||||
RELEASE(parser);
|
||||
|
@ -2018,6 +2018,7 @@ parseCharacterSet(NSString *token)
|
|||
else
|
||||
{
|
||||
NSData *d;
|
||||
unsigned pos;
|
||||
BOOL endedFinalPart = NO;
|
||||
|
||||
/*
|
||||
|
@ -2038,10 +2039,22 @@ parseCharacterSet(NSString *token)
|
|||
|
||||
/*
|
||||
* Create data object for this section and pass it to the
|
||||
* child parser to deal with.
|
||||
* child parser to deal with. NB. As lineStart points to
|
||||
* the start of the end boundary, we need to step back to
|
||||
* before the end of line introducing it in order to have
|
||||
* the correct length of body data for the child document.
|
||||
*/
|
||||
pos = lineStart;
|
||||
if (pos > 0 && bytes[pos-1] == '\n')
|
||||
{
|
||||
pos--;
|
||||
}
|
||||
if (pos > 0 && bytes[pos-1] == '\r')
|
||||
{
|
||||
pos--;
|
||||
}
|
||||
d = [NSData dataWithBytes: &bytes[sectionStart]
|
||||
length: lineStart - sectionStart];
|
||||
length: pos - sectionStart];
|
||||
if ([child parse: d] == YES)
|
||||
{
|
||||
/*
|
||||
|
@ -2058,7 +2071,7 @@ parseCharacterSet(NSString *token)
|
|||
* Store the document produced by the child, and
|
||||
* create a new parser for the next section.
|
||||
*/
|
||||
doc = [child document];
|
||||
doc = [child mimeDocument];
|
||||
if (doc != nil)
|
||||
{
|
||||
[document addContent: doc];
|
||||
|
|
|
@ -277,7 +277,7 @@ static void debugWrite(NSData *data)
|
|||
NSString *val;
|
||||
|
||||
[p parse: nil];
|
||||
info = [[p document] headerNamed: @"http"];
|
||||
info = [[p mimeDocument] headerNamed: @"http"];
|
||||
val = [info objectForKey: NSHTTPPropertyServerHTTPVersionKey];
|
||||
if (val != nil)
|
||||
[pageInfo setObject: val forKey: NSHTTPPropertyServerHTTPVersionKey];
|
||||
|
@ -319,7 +319,7 @@ static void debugWrite(NSData *data)
|
|||
RELEASE(document);
|
||||
RELEASE(parser);
|
||||
parser = [GSMimeParser new];
|
||||
document = RETAIN([parser document]);
|
||||
document = RETAIN([parser mimeDocument]);
|
||||
[self beginLoadInBackground];
|
||||
if (sock != nil)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue