kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-23 20:31:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #953 from dmishe/fix_query_params_base_url

Browse Source 
Associate base URL after query parameters
This commit is contained in:
Blake Watters
2012-09-28 14:17:28 -07:00
parent 5d41bf7ada 451a88bada
commit 464767961e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Code/Network/RKObjectManager.m
View File

@@ -211,11 +211,6 @@ NSURL *RKBaseURLAssociatedWithURL(NSURL *URL)
[request setAllHTTPHeaderFields:self.HTTPClient.defaultHeaders];
if (self.acceptHeaderValue) [request setValue:self.acceptHeaderValue forHTTPHeaderField:@"Accept"];
/**
Associate our baseURL with the URL of the `NSURLRequest` object. This enables us to match response descriptors by path.
*/
RKAssociateBaseURLWithURL(self.HTTPClient.baseURL, request.URL);
if (parameters) {
if ([method isEqualToString:@"GET"] || [method isEqualToString:@"HEAD"] || [method isEqualToString:@"DELETE"]) {
url = [NSURL URLWithString:[[url absoluteString] stringByAppendingFormat:[path rangeOfString:@"?"].location == NSNotFound ? @"?%@" : @"&%@", AFQueryStringFromParametersWithEncoding(parameters, self.HTTPClient.stringEncoding)]];
@@ -229,6 +224,11 @@ NSURL *RKBaseURLAssociatedWithURL(NSURL *URL)
}
}
/**
Associate our baseURL with the URL of the `NSURLRequest` object. This enables us to match response descriptors by path.
*/
RKAssociateBaseURLWithURL(self.HTTPClient.baseURL, request.URL);
return request;
}
- (NSMutableURLRequest *)requestWithPathForRouteNamed:(NSString *)routeName