diff options
author | 2015-05-12 12:37:24 -0700 | |
---|---|---|
committer | 2015-05-12 12:37:24 -0700 | |
commit | a468c36601dd5997580129bbd66b5ebed02521f8 (patch) | |
tree | da9bbea984725d8c16653805836877de7442dc7e /src/php/ext | |
parent | 2e1229172c0b696fd77e400edecfb1ec562e31b2 (diff) | |
parent | 9ec7f5ab81b98408b1cd4094ff536358528534c0 (diff) |
Merge pull request #1493 from ctiller/churn-churn-churn-the-api-gently-down-the-stream
Completion queue binding for new requests API change
Diffstat (limited to 'src/php/ext')
-rw-r--r-- | src/php/ext/grpc/server.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/php/ext/grpc/server.c b/src/php/ext/grpc/server.c index dbb9425619..18d34ab14b 100644 --- a/src/php/ext/grpc/server.c +++ b/src/php/ext/grpc/server.c @@ -119,12 +119,13 @@ PHP_METHOD(Server, __construct) { } server->queue = grpc_completion_queue_create(); if (args_array == NULL) { - server->wrapped = grpc_server_create(server->queue, NULL); + server->wrapped = grpc_server_create(NULL); } else { php_grpc_read_args_array(args_array, &args); - server->wrapped = grpc_server_create(server->queue, &args); + server->wrapped = grpc_server_create(&args); efree(args.args); } + grpc_server_register_completion_queue(server->wrapped, server->queue); } /** @@ -146,8 +147,9 @@ PHP_METHOD(Server, requestCall) { object_init(result); grpc_call_details_init(&details); grpc_metadata_array_init(&metadata); - error_code = grpc_server_request_call(server->wrapped, &call, &details, - &metadata, server->queue, NULL); + error_code = + grpc_server_request_call(server->wrapped, &call, &details, &metadata, + server->queue, server->queue, NULL); if (error_code != GRPC_CALL_OK) { zend_throw_exception(spl_ce_LogicException, "request_call failed", (long)error_code TSRMLS_CC); |