diff options
| author |  Stanley Cheung <stanley.cheung@gmail.com> | 2016-08-11 12:02:31 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-11 12:02:31 -0700 |
| commit | a6f6b6f4c9816e9ade3a5e997a9bc9b29224858f (patch) | |
| tree | 3a44fdd8e46b6e0b91de55e9ea8ee0ae7eab6567 | |
| parent | dae95b4e3608bbb4d012e10627fea6d2e74b48a0 (diff) | |
| parent | f789facafd66a4f1d789d5062f1dd17c0142c006 (diff) | |
Merge pull request #7674 from stanley-cheung/php7-ubuntu-fix
PHP7: fix ubuntu compile error
| -rw-r--r-- | examples/php/route_guide/README.md | 2 | ||||
| -rw-r--r-- | package.xml | 19 | ||||
| -rw-r--r-- | src/php/ext/grpc/php7_wrapper.h | 3 | ||||
| -rw-r--r-- | templates/package.xml.template | 19 |
4 files changed, 36 insertions, 7 deletions
diff --git a/examples/php/route_guide/README.md b/examples/php/route_guide/README.md index 4e74a79f13..26f1704f12 100644 --- a/examples/php/route_guide/README.md +++ b/examples/php/route_guide/README.md @@ -1,6 +1,6 @@ #gRPC Basics: PHP sample code The files in this folder are the samples used in [gRPC Basics: PHP][], -a detailed tutorial for using gRPC in Ruby. +a detailed tutorial for using gRPC in PHP. [gRPC Basics: PHP]:http://www.grpc.io/docs/tutorials/basic/php.html diff --git a/package.xml b/package.xml index 65764e8888..1bf57f28cc 100644 --- a/package.xml +++ b/package.xml @@ -10,7 +10,7 @@ <email>grpc-packages@google.com</email> <active>yes</active> </lead> - <date>2016-07-28</date> + <date>2016-08-09</date> <time>16:06:07</time> <version> <release>1.0.0</release> @@ -22,7 +22,7 @@ </stability> <license>BSD</license> <notes> -- PHP7 Support continued, reduce code duplication #7543 +- Fixed Ubuntu compile error #7571, #7642 </notes> <contents> <dir baseinstalldir="/" name="/"> @@ -1131,5 +1131,20 @@ Update to wrap gRPC C Core version 0.10.0 - PHP7 Support continued, reduce code duplication #7543 </notes> </release> + <release> + <version> + <release>1.0.0RC4</release> + <api>1.0.0RC4</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <date>2016-08-09</date> + <license>BSD</license> + <notes> +- Fixed Ubuntu compile error #7571, #7642 + </notes> + </release> </changelog> </package> diff --git a/src/php/ext/grpc/php7_wrapper.h b/src/php/ext/grpc/php7_wrapper.h index fd8d35636f..1d7824113f 100644 --- a/src/php/ext/grpc/php7_wrapper.h +++ b/src/php/ext/grpc/php7_wrapper.h @@ -143,8 +143,7 @@ static inline int php_grpc_zend_hash_find(HashTable *ht, char *key, int len, #define PHP_GRPC_RETURN_STRING(val, dup) RETURN_STRING(val) #define PHP_GRPC_MAKE_STD_ZVAL(pzv) \ - zval _stack_zval_##pzv; \ - pzv = &(_stack_zval_##pzv) + pzv = (zval *)emalloc(sizeof(zval)); #define PHP_GRPC_DELREF(zv) #define PHP_GRPC_WRAP_OBJECT_START(name) \ diff --git a/templates/package.xml.template b/templates/package.xml.template index 87b1038959..43d3aa2a58 100644 --- a/templates/package.xml.template +++ b/templates/package.xml.template @@ -12,7 +12,7 @@ <email>grpc-packages@google.com</email> <active>yes</active> </lead> - <date>2016-07-28</date> + <date>2016-08-09</date> <time>16:06:07</time> <version> <release>${settings.php_version.php()}</release> @@ -24,7 +24,7 @@ </stability> <license>BSD</license> <notes> - - PHP7 Support continued, reduce code duplication #7543 + - Fixed Ubuntu compile error #7571, #7642 </notes> <contents> <dir baseinstalldir="/" name="/"> @@ -249,5 +249,20 @@ - PHP7 Support continued, reduce code duplication #7543 </notes> </release> + <release> + <version> + <release>1.0.0RC4</release> + <api>1.0.0RC4</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <date>2016-08-09</date> + <license>BSD</license> + <notes> + - Fixed Ubuntu compile error #7571, #7642 + </notes> + </release> </changelog> </package> |