Index: src/OFHTTPClient.h ================================================================== --- src/OFHTTPClient.h +++ src/OFHTTPClient.h @@ -157,25 +157,25 @@ + (instancetype)client; /*! * @brief Asynchronously performs the specified HTTP request. */ -- (void)performRequest: (OFHTTPRequest *)request; +- (void)asyncPerformRequest: (OFHTTPRequest *)request; /*! * @brief Asynchronously performs the specified HTTP request. * * @param request The request to perform * @param redirects The maximum number of redirects after which no further * attempt is done to follow the redirect, but instead the * redirect is treated as an OFHTTPResponse */ -- (void)performRequest: (OFHTTPRequest *)request - redirects: (unsigned int)redirects; +- (void)asyncPerformRequest: (OFHTTPRequest *)request + redirects: (unsigned int)redirects; /*! * @brief Closes connections that are still open due to keep-alive. */ - (void)close; @end OF_ASSUME_NONNULL_END Index: src/OFHTTPClient.m ================================================================== --- src/OFHTTPClient.m +++ src/OFHTTPClient.m @@ -376,12 +376,12 @@ [newRequest setURL: newURL]; [newRequest setHeaders: newHeaders]; _client->_inProgress = false; - [_client performRequest: newRequest - redirects: _redirects - 1]; + [_client asyncPerformRequest: newRequest + redirects: _redirects - 1]; return; } } if (_status / 100 != 2) @@ -913,18 +913,18 @@ [self close]; [super dealloc]; } -- (void)performRequest: (OFHTTPRequest *)request +- (void)asyncPerformRequest: (OFHTTPRequest *)request { - [self performRequest: request - redirects: 10]; + [self asyncPerformRequest: request + redirects: 10]; } -- (void)performRequest: (OFHTTPRequest *)request - redirects: (unsigned int)redirects +- (void)asyncPerformRequest: (OFHTTPRequest *)request + redirects: (unsigned int)redirects { void *pool = objc_autoreleasePoolPush(); OFURL *URL = [request URL]; OFString *scheme = [URL scheme]; Index: tests/OFHTTPClientTests.m ================================================================== --- tests/OFHTTPClientTests.m +++ tests/OFHTTPClientTests.m @@ -120,14 +120,14 @@ URL = [OFURL URLWithString: [OFString stringWithFormat: @"http://127.0.0.1:%" @PRIu16 "/foo", server->_port]]; - TEST(@"-[performRequest:]", + TEST(@"-[asyncPerformRequest:]", (client = [OFHTTPClient client]) && R([client setDelegate: self]) && R(request = [OFHTTPRequest requestWithURL: URL]) && - R([client performRequest: request])) + R([client asyncPerformRequest: request])) [[OFRunLoop mainRunLoop] runUntilDate: [OFDate dateWithTimeIntervalSinceNow: 2]]; [response autorelease]; Index: utils/ofhttp/OFHTTP.m ================================================================== --- utils/ofhttp/OFHTTP.m +++ utils/ofhttp/OFHTTP.m @@ -906,11 +906,11 @@ request = [OFHTTPRequest requestWithURL: URL]; [request setHeaders: clientHeaders]; [request setMethod: OF_HTTP_REQUEST_METHOD_HEAD]; - [_HTTPClient performRequest: request]; + [_HTTPClient asyncPerformRequest: request]; return; } _detectedFileName = false; @@ -947,13 +947,13 @@ request = [OFHTTPRequest requestWithURL: URL]; [request setHeaders: clientHeaders]; [request setMethod: _method]; [request setBody: _body]; - [_HTTPClient performRequest: request]; + [_HTTPClient asyncPerformRequest: request]; return; next: [self performSelector: @selector(downloadNextURL) afterDelay: 0]; } @end