diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-07 13:44:45 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-07 13:44:45 -0700 |
| commit | ce9c4ee6db4ac0e4252edc083842b8542420a37f (patch) | |
| tree | 520b0c2d9ec3c1a9de51a8ab0d3429e4f5c663e7 /src/core/security/server_secure_chttp2.c | |
| parent | 9188d7a2df8217aa9414113a215668118a0dd700 (diff) | |
| parent | c5b5290bc6570a7226ed67d6884c374b236b48dc (diff) | |
Merge branch 'not-everyone-can-be-included' into just-say-goodbye-when-we-are-done
Conflicts:
src/core/transport/chttp2_transport.c
Diffstat (limited to 'src/core/security/server_secure_chttp2.c')
| -rw-r--r-- | src/core/security/server_secure_chttp2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index 6a99324da6..8a7ada07af 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -99,9 +99,10 @@ static void on_secure_transport_setup_done(void *statep, if (!state->is_shutdown) { mdctx = grpc_mdctx_create(); transport = grpc_create_chttp2_transport( - grpc_server_get_channel_args(state->server), secure_endpoint, NULL, 0, - mdctx, 0); + grpc_server_get_channel_args(state->server), secure_endpoint, mdctx, + 0); setup_transport(state, transport, mdctx); + grpc_chttp2_transport_start_reading(transport, NULL, 0); } else { /* We need to consume this here, because the server may already have gone * away. */ |