@@ -25,11 +25,11 @@ #import "OFFile.h" #import "OFURL.h" #ifdef OF_HAVE_SOCKETS # import "OFHTTPClient.h" # import "OFHTTPRequest.h" -# import "OFHTTPRequestReply.h" +# import "OFHTTPResponse.h" #endif #import "OFDictionary.h" #import "OFXMLElement.h" #import "OFSystemInfo.h" @@ -188,11 +188,11 @@ { void *pool; #ifdef OF_HAVE_SOCKETS OFHTTPClient *client; OFHTTPRequest *request; - OFHTTPRequestReply *reply; + OFHTTPResponse *response; OFDictionary *headers; OFString *contentLength; #endif Class c; @@ -208,24 +208,24 @@ } #ifdef OF_HAVE_SOCKETS client = [OFHTTPClient client]; request = [OFHTTPRequest requestWithURL: URL]; - reply = [client performRequest: request]; + response = [client performRequest: request]; - if ([reply statusCode] != 200) + if ([response statusCode] != 200) @throw [OFHTTPRequestFailedException exceptionWithRequest: request - reply: reply]; + response: response]; /* * TODO: This can be optimized by allocating a data array with the * capacity from the Content-Length header. */ - self = [[reply readDataArrayTillEndOfStream] retain]; + self = [[response readDataArrayTillEndOfStream] retain]; - headers = [reply headers]; + headers = [response headers]; if ((contentLength = [headers objectForKey: @"Content-Length"]) != nil) if ([self count] != (size_t)[contentLength decimalValue]) @throw [OFTruncatedDataException exception]; #else @throw [OFUnsupportedProtocolException exceptionWithURL: URL];