diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-05-26 15:22:28 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-05-26 15:22:28 +0000 |
| commit | 5fc2aa1a055055698a7cba7de14f2f976b2d3d05 (patch) | |
| tree | f53c6151f2e9944b72f179fbd26a5cf98c2aacdc /src | |
| parent | b89bac0752c5c5fbd8e54db684062976c3a3365f (diff) | |
| parent | 46356b72a011e02e7bd59bc390d358b887e84e7e (diff) | |
Merge branch 'eintr' into enable-epoll1
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/transport/chttp2/server/chttp2_server.c | 1 | ||||
| -rw-r--r-- | src/python/grpcio_reflection/grpc_reflection/v1alpha/reflection.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.c b/src/core/ext/transport/chttp2/server/chttp2_server.c index b9c62c376a..2c076e821c 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.c +++ b/src/core/ext/transport/chttp2/server/chttp2_server.c @@ -127,6 +127,7 @@ static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp, gpr_mu_lock(&state->mu); if (state->shutdown) { gpr_mu_unlock(&state->mu); + grpc_endpoint_shutdown(exec_ctx, tcp, GRPC_ERROR_NONE); grpc_endpoint_destroy(exec_ctx, tcp); gpr_free(acceptor); return; diff --git a/src/python/grpcio_reflection/grpc_reflection/v1alpha/reflection.py b/src/python/grpcio_reflection/grpc_reflection/v1alpha/reflection.py index cd896f32c3..0f399f8f8d 100644 --- a/src/python/grpcio_reflection/grpc_reflection/v1alpha/reflection.py +++ b/src/python/grpcio_reflection/grpc_reflection/v1alpha/reflection.py @@ -152,4 +152,4 @@ def enable_server_reflection(service_names, server, pool=None): pool: DescriptorPool object to use (descriptor_pool.Default() if None). """ reflection_pb2_grpc.add_ServerReflectionServicer_to_server( - ReflectionServicer(service_names), server, pool) + ReflectionServicer(service_names, pool), server) |