diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-06-27 14:01:25 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-06-27 14:01:25 -0700 |
| commit | 8551a709a1fb62a2e748d230b52b530df55b24eb (patch) | |
| tree | e5f221af5a7d644c934edd3fccbc487d08f31025 /src/core/ext/transport | |
| parent | a6e022f98f157ff938fbfb90b5666eab83579cd2 (diff) | |
| parent | a9df5d1029b303a305481c4bb765c6bed2e8ebbb (diff) | |
Merge github.com:grpc/grpc into %s
Diffstat (limited to 'src/core/ext/transport')
| -rw-r--r-- | src/core/ext/transport/chttp2/server/insecure/server_chttp2.c | 3 | ||||
| -rw-r--r-- | src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.c b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.c index 9bae3a94f9..e5c987925c 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.c +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.c @@ -97,7 +97,8 @@ int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) { goto error; } - err = grpc_tcp_server_create(NULL, &tcp); + err = + grpc_tcp_server_create(NULL, grpc_server_get_channel_args(server), &tcp); if (err != GRPC_ERROR_NONE) { goto error; } diff --git a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c index ead8a4d566..c42810e913 100644 --- a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c +++ b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c @@ -216,7 +216,8 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, state = gpr_malloc(sizeof(*state)); memset(state, 0, sizeof(*state)); grpc_closure_init(&state->destroy_closure, destroy_done, state); - err = grpc_tcp_server_create(&state->destroy_closure, &tcp); + err = grpc_tcp_server_create(&state->destroy_closure, + grpc_server_get_channel_args(server), &tcp); if (err != GRPC_ERROR_NONE) { goto error; } |