@@ -24,10 +24,11 @@ #import "OFString.h" #import "OFFile.h" #import "OFURL.h" #import "OFHTTPClient.h" #import "OFHTTPRequest.h" +#import "OFHTTPRequestReply.h" #import "OFXMLElement.h" #import "OFSystemInfo.h" #import "OFHTTPRequestFailedException.h" #import "OFInvalidArgumentException.h" @@ -140,11 +141,11 @@ - initWithContentsOfURL: (OFURL*)URL { void *pool; OFHTTPClient *client; OFHTTPRequest *request; - OFHTTPRequestResult *result; + OFHTTPRequestReply *reply; Class c; c = [self class]; [self release]; @@ -156,19 +157,19 @@ return self; } client = [OFHTTPClient client]; request = [OFHTTPRequest requestWithURL: URL]; - result = [client performRequest: request]; + reply = [client performRequest: request]; - if ([result statusCode] != 200) + if ([reply statusCode] != 200) @throw [OFHTTPRequestFailedException exceptionWithClass: [request class] request: request - result: result]; + reply: reply]; - self = [[result data] retain]; + self = [[reply data] retain]; objc_autoreleasePoolPop(pool); return self; } - initWithStringRepresentation: (OFString*)string