@@ -29,11 +29,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 "OFDataArray.h" #import "OFXMLElement.h" #ifdef OF_HAVE_SOCKETS @@ -927,11 +927,11 @@ { void *pool; #ifdef OF_HAVE_SOCKETS OFHTTPClient *client; OFHTTPRequest *request; - OFHTTPRequestReply *reply; + OFHTTPResponse *response; OFDictionary *headers; OFString *contentType, *contentLength; OFDataArray *data; #endif Class c; @@ -952,18 +952,18 @@ } #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]; - headers = [reply headers]; + headers = [response headers]; if (encoding == OF_STRING_ENCODING_AUTODETECT && (contentType = [headers objectForKey: @"Content-Type"]) != nil) { contentType = [contentType lowercaseString]; @@ -978,11 +978,11 @@ } if (encoding == OF_STRING_ENCODING_AUTODETECT) encoding = OF_STRING_ENCODING_UTF_8; - data = [reply readDataArrayTillEndOfStream]; + data = [response readDataArrayTillEndOfStream]; if ((contentLength = [headers objectForKey: @"Content-Length"]) != nil) if ([data count] != (size_t)[contentLength decimalValue]) @throw [OFTruncatedDataException exception];