diff options
| author |  kpayson64 <kpayson@google.com> | 2016-07-08 10:13:27 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-08 10:13:27 -0700 |
| commit | 2bece9e0e1d76910ca2e7e56eb3568983b17e6d4 (patch) | |
| tree | 7bbb8eb70cbaa48c597d0bbaf58b96602b238fa9 | |
| parent | 703bfbeb93e294078e12c2d4a522fb66c1e8aa3b (diff) | |
| parent | 69f9e448f8bcb52e27fe944f5ac335ef1ef5d93d (diff) | |
Merge pull request #7156 from stanley-cheung/php-add-comment-shutdown-warning
PHP: add warning about shutdown function
| -rw-r--r-- | examples/php/composer.json | 2 | ||||
| -rw-r--r-- | src/php/composer.json | 1 | ||||
| -rw-r--r-- | src/php/ext/grpc/php_grpc.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/examples/php/composer.json b/examples/php/composer.json index c837bf7ac0..950e11367d 100644 --- a/examples/php/composer.json +++ b/examples/php/composer.json @@ -9,6 +9,6 @@ } ], "require": { - "grpc/grpc": "dev-release-0_13" + "grpc/grpc": "v0.15.0" } } diff --git a/src/php/composer.json b/src/php/composer.json index 01674a25db..2ad73223c6 100644 --- a/src/php/composer.json +++ b/src/php/composer.json @@ -2,7 +2,6 @@ "name": "grpc/grpc", "type": "library", "description": "gRPC library for PHP", - "version": "0.14.0", "keywords": ["rpc"], "homepage": "http://grpc.io", "license": "BSD-3-Clause", diff --git a/src/php/ext/grpc/php_grpc.c b/src/php/ext/grpc/php_grpc.c index f4cb5b28cc..449ba3cd47 100644 --- a/src/php/ext/grpc/php_grpc.c +++ b/src/php/ext/grpc/php_grpc.c @@ -248,6 +248,8 @@ PHP_MSHUTDOWN_FUNCTION(grpc) { /* uncomment this line if you have INI entries UNREGISTER_INI_ENTRIES(); */ + // WARNING: This function IS being called by PHP when the extension + // is unloaded but the logs were somehow suppressed. grpc_shutdown_timeval(TSRMLS_C); grpc_php_shutdown_completion_queue(TSRMLS_C); grpc_shutdown(); |