Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4291 from google/3.5.x | Jisi Liu | 2018-02-26 | 8 | -49/+177 |
|\ | | | | | Merge 3.5.x to master | ||||
| * | Fix more memory leak for php c extension (#4211) | Paul Yang | 2018-01-25 | 6 | -19/+109 |
| | | | | | | | | | | | | * Fix more memory leak for php c extension * Fix memory leak for php5.5 | ||||
| * | Well known types are not initialized properly. (#4139) | Paul Yang | 2018-01-05 | 3 | -30/+68 |
| | | | | | | | | | | | | | | | | | | Previously, within the same load period of protobuf module, well known types are not initialized correctly for the second request. The reason is that well known type are only initialized if a method local static variable is not set. However, that variable is not reset after request ends. Therefore, when the second request comes, the method local static variable is still set (by previous request) and well types are not initialized in this case. | ||||
* | | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 10 | -30/+320 |
|\| | |||||
| * | Merge pull request #4034 from TeBoring/php-timestamp-bug | Paul Yang | 2017-12-15 | 4 | -16/+84 |
| |\ | | | | | | | Avoid calling method from php extension directly | ||||
| | * | Fix for php5.5 | Bo Yang | 2017-12-14 | 1 | -1/+1 |
| | | | |||||
| | * | Accept DatetimeInterface in fromDatetime | Bo Yang | 2017-12-14 | 2 | -12/+14 |
| | | | |||||
| | * | Avoid using php_date_get_date_ce() in case date extension is not | Bo Yang | 2017-12-13 | 1 | -2/+15 |
| | | | | | | | | | | | | available. | ||||
| | * | Call php method via function name instead of calling directly. | Bo Yang | 2017-12-12 | 4 | -34/+50 |
| | | | | | | | | | | | | | | | | | | | | | This changes the linking error if php extension is not statically linked to a runtime error. In this way, users who don't need Timestamp can still use protobuf even if date extension is not statically linked in php. | ||||
| | * | Replace private timelib_update_ts with public date_timestamp_get | Bo Yang | 2017-12-12 | 2 | -5/+31 |
| | | | |||||
| | * | Add PROTOBUF_ENABLE_TIMESTAMP to let user decide whether timestamp util | Bo Yang | 2017-12-12 | 2 | -2/+13 |
| | | | | | | | | | | | | can be used at install time. | ||||
| * | | Merge pull request #4028 from TeBoring/3.5.x | Paul Yang | 2017-12-12 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | Add backslach to make class explict in global namespace | ||||
| | * | Add backslach to make class explict in global namespace | Bo Yang | 2017-12-11 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch '3.5.0.1' into 3.5.x | Bo Yang | 2017-12-11 | 6 | -7/+66 |
| |\ \ | | |/ | |/| | |||||
| | * | Add release logv3.5.0.1 | Bo Yang | 2017-12-06 | 1 | -0/+16 |
| | | | |||||
| | * | Update php c extension version number to 3.5.0.1 | Bo Yang | 2017-12-06 | 2 | -4/+4 |
| | | | |||||
| | * | Fix memory leak in php7 | Bo Yang | 2017-12-06 | 3 | -5/+11 |
| | | | |||||
| | * | Fix several more memory leak | Bo Yang | 2017-12-06 | 4 | -6/+27 |
| | | | |||||
| | * | Fix memory leak when creating map field via array. | Bo Yang | 2017-12-06 | 2 | -2/+6 |
| | | | |||||
| | * | Fix memory leak when creating repeated field via array. | Bo Yang | 2017-12-06 | 2 | -2/+6 |
| | | | |||||
| | * | Remove duplicate typedef. (#3975) | Paul Yang | 2017-12-06 | 1 | -19/+7 |
| | | | |||||
| * | | Recursively clear unknown fields in submessages. (#3982) | Paul Yang | 2017-12-07 | 3 | -4/+159 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Recursively clear unknown fields in submessages. * Recursively discard unknown fields in submsg for c extension * Fix zts build * Add comment for tests * Add a TODO to add a util for encoding varint for better readability. * Add test for oneof message field. | ||||
| * | | Fix memory leak when creating map field via array. | Bo Yang | 2017-12-04 | 2 | -2/+6 |
| | | | |||||
| * | | Fix memory leak when creating repeated field via array. | Bo Yang | 2017-12-01 | 2 | -2/+6 |
| | | | |||||
* | | | Merge branch '3.5.x' into 3.5.x-merge | Adam Cozzette | 2017-11-30 | 7 | -32/+63 |
|\| | | |||||
| * | | Remove duplicate typedef. (#3975) | Paul Yang | 2017-11-30 | 1 | -19/+7 |
| | | | |||||
| * | | Provide discardUnknonwnFields API in php (#3976) | Paul Yang | 2017-11-30 | 5 | -0/+27 |
| | | | | | | | | | | | | | | | | | | * Provide discardUnknownFields API in php implementation * Provide discardUnknownFields API in php c extension. | ||||
| * | | Update version number for php c extension (#3896) | Paul Yang | 2017-11-15 | 2 | -4/+20 |
| | | | |||||
| * | | Use fully qualifed name for DescriptorPool in Any.php to avoid name (#3886) | Paul Yang | 2017-11-15 | 1 | -4/+3 |
| |/ | | | | | conflict | ||||
| * | All integer types should accept null in json. (#3869) | Paul Yang | 2017-11-13 | 1 | -5/+6 |
| | | |||||
| * | Fix php well known type conformance tests (#3828) (#3840) | Paul Yang | 2017-11-04 | 7 | -49/+508 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix php well known type conformance tests * Properly generate code for test.proto * Provide GPBMetadata files in c extensions for generated files to import. * Remove unnecessary test * Clean up code * Add declaration for initOnce. * Refactoring | ||||
* | | Update README.md: C extension works on PHP 7 (#3888) | Issac Trotts | 2017-11-15 | 1 | -1/+1 |
| | | | | | | Here's the pull request that made it happen: https://github.com/google/protobuf/pull/2951 | ||||
* | | Fix php well known type conformance tests (#3828) | Paul Yang | 2017-11-03 | 7 | -49/+508 |
|/ | | | | | | | | | | | | | | | | * Fix php well known type conformance tests * Properly generate code for test.proto * Provide GPBMetadata files in c extensions for generated files to import. * Remove unnecessary test * Clean up code * Add declaration for initOnce. * Refactoring | ||||
* | update joda-time javadoc url | xuwei-k | 2017-10-30 | 1 | -1/+1 |
| | |||||
* | Update descriptor protos | Jisi Liu | 2017-10-18 | 1 | -3/+6 |
| | |||||
* | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-11 | 14 | -21/+1205 |
|\ | |||||
| * | Merge pull request #3612 from TeBoring/php-bug | Paul Yang | 2017-09-15 | 11 | -16/+1011 |
| |\ | | | | | | | Add prefix to php reserved keywords. | ||||
| | * | Exclude valid constant name from reserved name. | Bo Yang | 2017-09-12 | 6 | -223/+600 |
| | | | |||||
| | * | Change array to map for reserved names in c extension | Bo Yang | 2017-09-11 | 3 | -24/+69 |
| | | | |||||
| | * | Change array to associate array. | Bo Yang | 2017-09-11 | 1 | -20/+21 |
| | | | |||||
| | * | Add prefix to php reserved keywords. | Bo Yang | 2017-09-08 | 7 | -5/+577 |
| | | | |||||
| * | | Bump version for minor release | Jisi Liu | 2017-09-14 | 2 | -5/+21 |
| |/ | |||||
| * | change the field number of php_generic_service to fix the conflict with (#3576) | Paul Yang | 2017-08-30 | 3 | -4/+68 |
| | | | | | | internal descriptor.proto | ||||
* | | Reserve unknown fields in php (#3659) | Paul Yang | 2017-10-09 | 12 | -841/+2101 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reserve unknown fields in upb 1) For decoding, an unknownfields will be lazily created on message, which contains bytes of unknown fields. 2) For encoding, if the unknownfields is present on message, all bytes contained in it will be serialized. * Register the function to encode unknown field at decode time. * Remove upb_handlers_setaddunknown * Use upb_sink_putunknown in decoder * Remove upb_pb_encoder_encode_unknown * Do not expose encode_unknown * Implement reserve unknown field in php Implement. * Make buffer private to CodedInputStream | ||||
* | | Add well known types to php runtime. (#3697) | Paul Yang | 2017-10-05 | 41 | -101/+5374 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add well known types to php runtime. * Fix php7.0 tests * No longer generate empty.proto in test as it has been included in runtime. * Fix zts build * Clean code * Rename g_p_b_empty to empty. * Don't generate code for empty.proto in compatibility test * Fix 32-bit * Fix mac build * Fix Makefile.am to add new files | ||||
* | | Enforce all error report for php tests. (#3670) | Paul Yang | 2017-09-22 | 4 | -5/+24 |
| | | | | | | | | | | | | * Enforce all error report for php tests. * Import vendor/autoload.php in tests/bootstrap_phpunit.php | ||||
* | | Add $ before url_prefix_len to make it a variable. (#3668) | Paul Yang | 2017-09-20 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | * Add $ before url_prefix_len to make it a variable. * Remove unnecessary string length check * Remove useless $type_url_len | ||||
* | | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 3 | -4/+98 |
| | | |||||
* | | Add well-known timestamps to JSON for PHP (#3564) | Jack Wakefield | 2017-09-10 | 3 | -31/+142 |
| | | |||||
* | | Add native php support for Duration. (#3583) | Paul Yang | 2017-09-05 | 6 | -0/+259 |
| | |