diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-14 13:14:10 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-14 13:14:10 -0700 |
| commit | 2c6f63731c7ddc761eac80be7609a9e80116ddee (patch) | |
| tree | 02896c6cbbacb3e8931a347166abf7538187d255 /src/php | |
| parent | 694cd708313945c31e4b2c1b518d3cff80f8b031 (diff) | |
| parent | e412a180602753972ac496560322e224a5db987f (diff) | |
Merge github.com:grpc/grpc into cpparena
Diffstat (limited to 'src/php')
| -rw-r--r-- | src/php/composer.json | 2 | ||||
| -rw-r--r-- | src/php/ext/grpc/completion_queue.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/php/composer.json b/src/php/composer.json index 2b140077cc..24c17c3b57 100644 --- a/src/php/composer.json +++ b/src/php/composer.json @@ -2,7 +2,7 @@ "name": "grpc/grpc-dev", "description": "gRPC library for PHP - for Developement use only", "license": "BSD-3-Clause", - "version": "1.3.0", + "version": "1.4.0", "require": { "php": ">=5.5.0", "google/protobuf": "^v3.1.0" diff --git a/src/php/ext/grpc/completion_queue.c b/src/php/ext/grpc/completion_queue.c index 741204b0b1..c75a524530 100644 --- a/src/php/ext/grpc/completion_queue.c +++ b/src/php/ext/grpc/completion_queue.c @@ -38,13 +38,10 @@ grpc_completion_queue *completion_queue; void grpc_php_init_completion_queue(TSRMLS_D) { - completion_queue = grpc_completion_queue_create(NULL); + completion_queue = grpc_completion_queue_create_for_pluck(NULL); } void grpc_php_shutdown_completion_queue(TSRMLS_D) { grpc_completion_queue_shutdown(completion_queue); - while (grpc_completion_queue_next(completion_queue, - gpr_inf_future(GPR_CLOCK_REALTIME), - NULL).type != GRPC_QUEUE_SHUTDOWN); grpc_completion_queue_destroy(completion_queue); } |