Differences From Artifact [6bcf634ee6]:
- File
src/OFHTTPRequestReply.m
— part of check-in
[c5ef582958]
at
2013-03-04 17:20:15
on branch trunk
— Replace BOOL with bool.
The only places where BOOL is left are those where they are required by
the ABI. (user: js, size: 3141) [annotate] [blame] [check-ins using]
To Artifact [96daca57e6]:
- File src/OFHTTPRequestReply.m — part of check-in [0a1b06a6bf] at 2013-03-17 15:23:56 on branch trunk — Add -[OFHTTPRequestReply string]. (user: js, size: 4566) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 |
#include "config.h"
#import "OFHTTPRequestReply.h"
#import "OFString.h"
#import "OFDictionary.h"
#import "OFArray.h"
#import "autorelease.h"
#import "macros.h"
#import "OFInvalidFormatException.h"
#import "OFOutOfRangeException.h"
#import "OFUnsupportedVersionException.h"
@implementation OFHTTPRequestReply
- init
{
self = [super init];
| > > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 |
#include "config.h"
#import "OFHTTPRequestReply.h"
#import "OFString.h"
#import "OFDictionary.h"
#import "OFArray.h"
#import "OFDataArray.h"
#import "autorelease.h"
#import "macros.h"
#import "OFInvalidFormatException.h"
#import "OFOutOfRangeException.h"
#import "OFTruncatedDataException.h"
#import "OFUnsupportedVersionException.h"
@implementation OFHTTPRequestReply
- init
{
self = [super init];
|
| ︙ | ︙ | |||
109 110 111 112 113 114 115 116 117 118 119 120 121 122 |
OF_GETTER(_headers, true)
}
- (void)setHeaders: (OFDictionary*)headers
{
OF_SETTER(_headers, headers, true, 1)
}
- (OFString*)description
{
void *pool = objc_autoreleasePoolPush();
OFString *indentedHeaders, *ret;
indentedHeaders = [[_headers description]
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 |
OF_GETTER(_headers, true)
}
- (void)setHeaders: (OFDictionary*)headers
{
OF_SETTER(_headers, headers, true, 1)
}
- (OFString*)string
{
return [self stringWithEncoding: OF_STRING_ENCODING_AUTODETECT];
}
- (OFString*)stringWithEncoding: (of_string_encoding_t)encoding
{
void *pool = objc_autoreleasePoolPush();
OFString *contentType, *contentLength, *ret;
OFDataArray *data;
if (encoding == OF_STRING_ENCODING_AUTODETECT &&
(contentType = [_headers objectForKey: @"Content-Type"]) != nil) {
contentType = [contentType lowercaseString];
if ([contentType hasSuffix: @"charset=utf-8"])
encoding = OF_STRING_ENCODING_UTF_8;
if ([contentType hasSuffix: @"charset=iso-8859-1"])
encoding = OF_STRING_ENCODING_ISO_8859_1;
if ([contentType hasSuffix: @"charset=iso-8859-15"])
encoding = OF_STRING_ENCODING_ISO_8859_15;
if ([contentType hasSuffix: @"charset=windows-1252"])
encoding = OF_STRING_ENCODING_WINDOWS_1252;
}
if (encoding == OF_STRING_ENCODING_AUTODETECT)
encoding = OF_STRING_ENCODING_UTF_8;
data = [self readDataArrayTillEndOfStream];
if ((contentLength = [_headers objectForKey: @"Content-Length"]) != nil)
if ([data count] != (size_t)[contentLength decimalValue])
@throw [OFTruncatedDataException
exceptionWithClass: [self class]];
ret = [[OFString alloc] initWithCString: (char*)[data items]
encoding: encoding
length: [data count]];
objc_autoreleasePoolPop(pool);
return [ret autorelease];
}
- (OFString*)description
{
void *pool = objc_autoreleasePoolPush();
OFString *indentedHeaders, *ret;
indentedHeaders = [[_headers description]
|
| ︙ | ︙ |