Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix HTTPS uploads #438

Merged
merged 2 commits into from Aug 23, 2016
Merged

Fix HTTPS uploads #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68b9948
Fix HTTPS uploads
joeljfischer Aug 22, 2016
12b1783
Minor clarity updates to HTTPS alterations
joeljfischer Aug 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions SmartDeviceLink/SDLURLSession.m
View file
Open in desktop
Expand Up @@ -76,13 +76,13 @@ - (void)dataFromURL:(NSURL *)url completionHandler:(SDLURLConnectionRequestCompl
}

- (void)uploadWithURLRequest:(NSURLRequest *)request data:(NSData *)data completionHandler:(SDLURLConnectionRequestCompletionHandler)completionHandler {
NSURL *newURL = nil;
if ([request.URL.scheme isEqualToString:@"http"]) {
newURL = [NSURL URLWithString:[request.URL.absoluteString stringByReplacingCharactersInRange:NSMakeRange(0, 4) withString:@"https"]];
NSURL *url = request.URL;
if ([url.scheme isEqualToString:@"http"]) {
url = [NSURL URLWithString:[url.absoluteString stringByReplacingCharactersInRange:NSMakeRange(0, 4) withString:@"https"]];
}

NSMutableURLRequest *mutableRequest = [request mutableCopy];
mutableRequest.URL = newURL;
mutableRequest.URL = url;
mutableRequest.HTTPBody = data;
mutableRequest.HTTPMethod = @"POST";

Expand Down
2 changes: 1 addition & 1 deletion SmartDeviceLinkTests/UtilitiesSpecs/HTTP Connection/SDLURLSessionSpec.m
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
__block SDLURLSession *testSession = nil;

describe(@"attempting to get good data", ^{
context(@"from an http address", ^{
context(@"from an https address", ^{
context(@"uploading data", ^{
NSData *testData = [@"testData" dataUsingEncoding:NSUTF8StringEncoding];
NSArray *someJSONObject = @[@"one", @"two"];
Expand Down