Overview
| Comment: | Add -[OFHTTPRequestReply string]. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
0a1b06a6bfdc5058f4450be32de0a6fc |
| User & Date: | js on 2013-03-17 15:23:56 |
| Other Links: | manifest | tags |
Context
|
2013-03-18
| ||
| 13:17 | Make GCC happy again. check-in: 074f577275 user: js tags: trunk | |
|
2013-03-17
| ||
| 15:23 | Add -[OFHTTPRequestReply string]. check-in: 0a1b06a6bf user: js tags: trunk | |
|
2013-03-16
| ||
| 10:13 | Add forwardingTargetForSelector: for AMD64/ELF. check-in: 5a6cc94418 user: js tags: trunk | |
Changes
Modified src/OFHTTPRequestReply.h from [b047464ff4] to [bdd473d229].
| ︙ | |||
87 88 89 90 91 92 93 94 | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | + + + + + + + + + + + + + + + | /*! * @brief Returns the headers of the reply to the HTTP request. * * @param headers The headers of the reply to the HTTP request */ - (void)setHeaders: (OFDictionary*)headers; /*! * @brief Returns the reply as a string, trying to detect the encoding. * * @return The reply as a string */ - (OFString*)string; /*! * @brief Returns the reply as a string, trying to detect the encoding and * falling back to the specified encoding if not detectable. * * @return The reply as a string */ - (OFString*)stringWithEncoding: (of_string_encoding_t)encoding; @end |
Modified src/OFHTTPRequestReply.m from [6bcf634ee6] to [96daca57e6].
| ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | 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 | 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]
|
| ︙ |