diff options
| author |  Muxi Yan <mxyan@google.com> | 2018-10-18 09:38:26 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2018-10-18 09:38:26 -0700 |
| commit | 62693ec1bd0fe0133a3d382ef2e11ffa935e9904 (patch) | |
| tree | f84b6c168f55ef2f4b8661ab64960fb11b0f7d76 /src/objective-c/GRPCClient | |
| parent | be4ab30899f6ae91e07f02c33297ca462f778296 (diff) | |
| parent | d2704ecca0b6cc43e8dfde6dd64875b4fb71d6cd (diff) | |
Merge remote-tracking branch 'upstream/master' into config-isolation
Diffstat (limited to 'src/objective-c/GRPCClient')
| -rw-r--r-- | src/objective-c/GRPCClient/private/GRPCHost.m | 2 | ||||
| -rw-r--r-- | src/objective-c/GRPCClient/private/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/objective-c/GRPCClient/private/GRPCHost.m b/src/objective-c/GRPCClient/private/GRPCHost.m index de6f09a44b..7c31b10636 100644 --- a/src/objective-c/GRPCClient/private/GRPCHost.m +++ b/src/objective-c/GRPCClient/private/GRPCHost.m @@ -58,7 +58,7 @@ static NSMutableDictionary *kHostCache; // gRPC library. // TODO(jcanizales): Add unit tests for the types of addresses we want to let pass untouched. NSURL *hostURL = [NSURL URLWithString:[@"https://" stringByAppendingString:address]]; - if (hostURL.host && !hostURL.port) { + if (hostURL.host && hostURL.port == nil) { address = [hostURL.host stringByAppendingString:@":443"]; } diff --git a/src/objective-c/GRPCClient/private/version.h b/src/objective-c/GRPCClient/private/version.h index 38862e102a..d5463c0b4c 100644 --- a/src/objective-c/GRPCClient/private/version.h +++ b/src/objective-c/GRPCClient/private/version.h @@ -22,4 +22,4 @@ // instead. This file can be regenerated from the template by running // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.16.0-dev" +#define GRPC_OBJC_VERSION_STRING @"1.17.0-dev" |