Index: src/OFHTTPClient.h ================================================================== --- src/OFHTTPClient.h +++ src/OFHTTPClient.h @@ -127,15 +127,15 @@ * (e.g. to set the cookies for the new URI), however, keep in * mind that this will change the request you originally passed. * @param response The response indicating the redirect * @return A boolean whether the OFHTTPClient should follow the redirect */ -- (bool)client: (OFHTTPClient *)client - shouldFollowRedirect: (OFURI *)URI - statusCode: (short)statusCode - request: (OFHTTPRequest *)request - response: (OFHTTPResponse *)response; +- (bool)client: (OFHTTPClient *)client + shouldFollowRedirectToURI: (OFURI *)URI + statusCode: (short)statusCode + request: (OFHTTPRequest *)request + response: (OFHTTPResponse *)response; @end /** * @class OFHTTPClient OFHTTPClient.h ObjFW/OFHTTPClient.h * Index: src/OFHTTPClient.m ================================================================== --- src/OFHTTPClient.m +++ src/OFHTTPClient.m @@ -357,14 +357,15 @@ OFOrderedSame && [newURIScheme caseInsensitiveCompare: @"http"] == OFOrderedSame) follow = false; - if (follow && [_client->_delegate respondsToSelector: @selector( - client:shouldFollowRedirect:statusCode:request:response:)]) + if (follow && [_client->_delegate respondsToSelector: + @selector(client:shouldFollowRedirectToURI:statusCode: + request:response:)]) follow = [_client->_delegate client: _client - shouldFollowRedirect: newURI + shouldFollowRedirectToURI: newURI statusCode: _status request: _request response: response]; else if (follow) follow = defaultShouldFollow(_request.method, _status); @@ -1199,23 +1200,23 @@ didReceiveHeaders: headers statusCode: statusCode request: request]; } -- (bool)client: (OFHTTPClient *)client - shouldFollowRedirect: (OFURI *)URI - statusCode: (short)statusCode - request: (OFHTTPRequest *)request - response: (OFHTTPResponse *)response -{ - if ([_delegate respondsToSelector: @selector(client: - shouldFollowRedirect:statusCode:request:response:)]) - return [_delegate client: client - shouldFollowRedirect: URI - statusCode: statusCode - request: request - response: response]; +- (bool)client: (OFHTTPClient *)client + shouldFollowRedirectToURI: (OFURI *)URI + statusCode: (short)statusCode + request: (OFHTTPRequest *)request + response: (OFHTTPResponse *)response +{ + if ([_delegate respondsToSelector: @selector( + client:shouldFollowRedirectToURI:statusCode:request:response:)]) + return [_delegate client: client + shouldFollowRedirectToURI: URI + statusCode: statusCode + request: request + response: response]; else return defaultShouldFollow(request.method, statusCode); } @end Index: utils/ofhttp/OFHTTP.m ================================================================== --- utils/ofhttp/OFHTTP.m +++ utils/ofhttp/OFHTTP.m @@ -606,15 +606,15 @@ size_t length = [_body readIntoBuffer: buffer length: 4096]; [body writeBuffer: buffer length: length]; } } -- (bool)client: (OFHTTPClient *)client - shouldFollowRedirect: (OFURI *)URI - statusCode: (short)statusCode - request: (OFHTTPRequest *)request - response: (OFHTTPResponse *)response +- (bool)client: (OFHTTPClient *)client + shouldFollowRedirectToURI: (OFURI *)URI + statusCode: (short)statusCode + request: (OFHTTPRequest *)request + response: (OFHTTPResponse *)response { if (_verbose) { void *pool = objc_autoreleasePoolPush(); OFDictionary OF_GENERIC(OFString *, OFString *) *headers = response.headers;