@@ -19,10 +19,11 @@ #include #include #import "OFHTTPClient.h" #import "OFHTTPRequest.h" +#import "OFHTTPRequestReply.h" #import "OFString.h" #import "OFURL.h" #import "OFTCPSocket.h" #import "OFDictionary.h" #import "OFDataArray.h" @@ -104,27 +105,27 @@ - (BOOL)storesData { return storesData; } -- (OFHTTPRequestResult*)performRequest: (OFHTTPRequest*)request +- (OFHTTPRequestReply*)performRequest: (OFHTTPRequest*)request { return [self performRequest: request redirects: 10]; } -- (OFHTTPRequestResult*)performRequest: (OFHTTPRequest*)request - redirects: (size_t)redirects +- (OFHTTPRequestReply*)performRequest: (OFHTTPRequest*)request + redirects: (size_t)redirects { void *pool = objc_autoreleasePoolPush(); OFURL *URL = [request URL]; OFString *scheme = [URL scheme]; of_http_request_type_t requestType = [request requestType]; OFDictionary *headers = [request headers]; OFDataArray *POSTData = [request POSTData]; OFTCPSocket *sock; - OFHTTPRequestResult *result; + OFHTTPRequestReply *reply; OFString *line, *path, *version; OFMutableDictionary *serverHeaders; OFDataArray *data; OFEnumerator *keyEnumerator, *objectEnumerator; OFString *key, *object, *contentLengthHeader; @@ -481,22 +482,22 @@ @throw [OFTruncatedDataException exceptionWithClass: [self class]]; [serverHeaders makeImmutable]; - result = [[OFHTTPRequestResult alloc] initWithStatusCode: status - headers: serverHeaders - data: data]; + reply = [[OFHTTPRequestReply alloc] initWithStatusCode: status + headers: serverHeaders + data: data]; objc_autoreleasePoolPop(pool); - [result autorelease]; + [reply autorelease]; if (status != 200) @throw [OFHTTPRequestFailedException exceptionWithClass: [self class] request: request - result: result]; + reply: reply]; - return result; + return reply; } @end