Merge branch 'you-complete-me' into we-dont-need-no-backup

10 years ago · 7f19a43cca
parent 43de01a25c c81f7209e6
commit 7f19a43cca
1 changed files with 2 additions and 1 deletions
--- a/src/php/ext/grpc/server.c
+++ b/src/php/ext/grpc/server.c
@ -63,7 +63,8 @@ zend_class_entry *grpc_ce_server;
 void free_wrapped_grpc_server(void *object TSRMLS_DC) {
  wrapped_grpc_server *server = (wrapped_grpc_server *)object;
  if (server->wrapped != NULL) {
-    grpc_server_shutdown(server->wrapped);
+    grpc_server_shutdown_and_notify(server->wrapped, completion_queue, NULL);
+    grpc_completion_queue_pluck(completion_queue, NULL, gpr_inf_future);
    grpc_server_destroy(server->wrapped);
  }
  efree(server);