Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3.13.x'

Browse Source
pull/7952/head
Bo Yang 4 years ago
parent f5a3b92cf7 d1eca4e4b4
commit 37e69bcddf
3 changed files with 21 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      php/ext/google/protobuf/message.c
  2. 20
      php/ext/google/protobuf/package.xml
  3. 4
      php/ext/google/protobuf/protobuf.h

4
php/ext/google/protobuf/message.c
Unescape View File

@ -356,14 +356,14 @@ static PROTO_RETURN_VAL Message_write_property(
} }
upb_msg_set(intern->msg, f, msgval, arena); upb_msg_set(intern->msg, f, msgval, arena);
#if PHP_VERSION_ID < 704000 #if PHP_VERSION_ID < 70400
return; return;
#else #else
return val; return val;
#endif #endif
error: error:
#if PHP_VERSION_ID < 704000 #if PHP_VERSION_ID < 70400
return; return;
#else #else
return &EG(error_zval); return &EG(error_zval);

20
php/ext/google/protobuf/package.xml
Unescape View File

@ -10,11 +10,11 @@
<email>protobuf-opensource@google.com</email> <email>protobuf-opensource@google.com</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2020-08-14</date> <date>2020-10-08</date>
<time>14:07:59</time> <time>14:07:59</time>
<version> <version>
<release>3.13.0</release> <release>3.13.0.1</release>
<api>3.13.0</api> <api>3.13.0.1</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
@ -675,5 +675,19 @@ G A release.
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license> <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes>GA release.</notes> <notes>GA release.</notes>
</release> </release>
<release>
<version>
<release>3.13.0.1</release>
<api>3.13.0.1</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<date>2020-10-08</date>
<time>14:07:59</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes>GA release.</notes>
</release>
</changelog> </changelog>
</package> </package>

4
php/ext/google/protobuf/protobuf.h
Unescape View File

@ -56,7 +56,7 @@ const zval *get_generated_pool();
// instead of zval* and zend_string* instead of zval* for property names. // instead of zval* and zend_string* instead of zval* for property names.
// https://github.com/php/php-src/blob/php-8.0.0beta1/UPGRADING.INTERNALS#L37-L39 // https://github.com/php/php-src/blob/php-8.0.0beta1/UPGRADING.INTERNALS#L37-L39
#if PHP_VERSION_ID < 80000 #if PHP_VERSION_ID < 80000
#define PROTO_VAL zval #define PROTO_VAL zval
#define PROTO_STR zval #define PROTO_STR zval
#define PROTO_MSG_P(obj) (Message*)Z_OBJ_P(obj) #define PROTO_MSG_P(obj) (Message*)Z_OBJ_P(obj)
#define PROTO_STRVAL_P(obj) Z_STRVAL_P(obj) #define PROTO_STRVAL_P(obj) Z_STRVAL_P(obj)
@ -69,7 +69,7 @@ const zval *get_generated_pool();
#define PROTO_STRLEN_P(obj) ZSTR_LEN(obj) #define PROTO_STRLEN_P(obj) ZSTR_LEN(obj)
#endif #endif
#define PHP_PROTOBUF_VERSION "3.13.0" #define PHP_PROTOBUF_VERSION "3.13.0.1"
// ptr -> PHP object cache. This is a weak map that caches lazily-created // ptr -> PHP object cache. This is a weak map that caches lazily-created
// wrapper objects around upb types: // wrapper objects around upb types:

Write Preview
Loading…
Cancel
Save