diff options
| author |  David G. Quintas <dgq@google.com> | 2017-04-12 14:10:02 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-04-12 14:10:02 -0700 |
| commit | d338dd3d391e4fe1eabcaf19586943604b2358df (patch) | |
| tree | 47d2ba3b41cd890a5d73dc62f547be245803ecbb /src/core | |
| parent | f452cc5f9a7f51f5b034db643f90217961f3dfc8 (diff) | |
| parent | 43713e6ae1de899a1bbdbe49eb14fabe7d5b6146 (diff) | |
Merge pull request #10598 from jtattermusch/manual_upmerge_v12x
Manual upmerge from v1.2.x
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/lib/channel/message_size_filter.c | 4 | ||||
| -rw-r--r-- | src/core/lib/iomgr/resolve_address_uv.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/core/lib/channel/message_size_filter.c b/src/core/lib/channel/message_size_filter.c index 57726c8476..c12fabb37c 100644 --- a/src/core/lib/channel/message_size_filter.c +++ b/src/core/lib/channel/message_size_filter.c @@ -218,14 +218,14 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, if (strcmp(args->channel_args->args[i].key, GRPC_ARG_MAX_SEND_MESSAGE_LENGTH) == 0) { const grpc_integer_options options = { - GRPC_DEFAULT_MAX_SEND_MESSAGE_LENGTH, 0, INT_MAX}; + GRPC_DEFAULT_MAX_SEND_MESSAGE_LENGTH, -1, INT_MAX}; chand->max_send_size = grpc_channel_arg_get_integer(&args->channel_args->args[i], options); } if (strcmp(args->channel_args->args[i].key, GRPC_ARG_MAX_RECEIVE_MESSAGE_LENGTH) == 0) { const grpc_integer_options options = { - GRPC_DEFAULT_MAX_RECV_MESSAGE_LENGTH, 0, INT_MAX}; + GRPC_DEFAULT_MAX_RECV_MESSAGE_LENGTH, -1, INT_MAX}; chand->max_recv_size = grpc_channel_arg_get_integer(&args->channel_args->args[i], options); } diff --git a/src/core/lib/iomgr/resolve_address_uv.c b/src/core/lib/iomgr/resolve_address_uv.c index 102d1aa290..6b468764fc 100644 --- a/src/core/lib/iomgr/resolve_address_uv.c +++ b/src/core/lib/iomgr/resolve_address_uv.c @@ -69,8 +69,9 @@ static int retry_named_port_failure(int status, request *r, int retry_status; uv_getaddrinfo_t *req = gpr_malloc(sizeof(uv_getaddrinfo_t)); req->data = r; + r->port = svc[i][1]; retry_status = uv_getaddrinfo(uv_default_loop(), req, getaddrinfo_cb, - r->host, svc[i][1], r->hints); + r->host, r->port, r->hints); if (retry_status < 0 || getaddrinfo_cb == NULL) { // The callback will not be called gpr_free(req); |