Index: src/OFHTTPRequest.h ================================================================== --- src/OFHTTPRequest.h +++ src/OFHTTPRequest.h @@ -102,21 +102,21 @@ /** * Performs the HTTP request and returns an OFHTTPRequestResult. * * \return An OFHTTPRequestResult with the result of the HTTP request */ -- (OFHTTPRequestResult*)result; +- (OFHTTPRequestResult*)perform; /** * Performs the HTTP request and returns an OFHTTPRequestResult. * * \param redirects The maximum number of redirects after which no further * attempt is done to follow the redirect, but instead the * redirect is returned as an OFHTTPRequest * \return An OFHTTPRequestResult with the result of the HTTP request */ -- (OFHTTPRequestResult*)resultWithRedirects: (size_t)redirects; +- (OFHTTPRequestResult*)performWithRedirects: (size_t)redirects; @end /** * \brief A class for storing the result of an HTTP request. */ Index: src/OFHTTPRequest.m ================================================================== --- src/OFHTTPRequest.m +++ src/OFHTTPRequest.m @@ -100,16 +100,16 @@ - (OFDictionary*)headers { return [[headers copy] autorelease]; } -- (OFHTTPRequestResult*)result +- (OFHTTPRequestResult*)perform { - return [self resultWithRedirects: 10]; + return [self performWithRedirects: 10]; } -- (OFHTTPRequestResult*)resultWithRedirects: (size_t)redirects +- (OFHTTPRequestResult*)performWithRedirects: (size_t)redirects { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFString *scheme = [URL scheme]; OFTCPSocket *sock; OFHTTPRequestResult *result; @@ -254,11 +254,11 @@ } [pool release]; pool = nil; - return [self resultWithRedirects: + return [self performWithRedirects: redirects - 1]; } [s_headers setObject: value forKey: key]; Index: src/OFString.m ================================================================== --- src/OFString.m +++ src/OFString.m @@ -709,11 +709,11 @@ return self; } req = [OFHTTPRequest request]; [req setURL: url]; - res = [req result]; + res = [req perform]; if ([res statusCode] != 200) @throw [OFHTTPRequestFailedException newWithClass: [req class] HTTPRequest: req