Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 3.4.x | Bo Yang | 2017-08-05 | 46 | -126/+1627 |
|\ | |||||
| * | Update commit id in Dockerfile to reflect change in #3391 (#3459) | Paul Yang | 2017-08-04 | 2 | -2/+2 |
| | | |||||
| * | Fix the bug in php c extension that setting one field can change ↵ | Paul Yang | 2017-08-04 | 7 | -33/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | another field's value. (#3455) * Fix the bug in php c extension that setting one field can change another field's value. The reason is that previously, in c extension, it was assumed that the order that fields were declared in php is the same as the order of fields in upb. This is not true. Now, for every field in upb, we will look up the actual property that is corresponding to the upb field. * Cleanup pull request * Fix indentation * Port to php5 * Port with php7.1 * Port to zts | ||||
| * | Update PHP descriptors (#3391) | michaelbausor | 2017-08-04 | 17 | -21/+617 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add descriptors test * Update descriptors tests * Add public descriptors * Add test_desriptors.proto to test script * Update composer files * Remove references to GPBType, update tests to be compatible with c * Update for c extension compatibility * Remove nested enums for descriptor, update tests * Strip leading '.' from descriptor name * Update tests with test for getClass, fix OneofDescriptor * Add new files to Makefile.am | ||||
| * | Merge pull request #3456 from giorgioazzinnaro/patch-1 | Feng Xiao | 2017-08-04 | 1 | -0/+1 |
| |\ | | | | | | | Update third party addons with ProfaneDB | ||||
| | * | Update third party addons with ProfaneDB | Giorgio Azzinnaro | 2017-08-04 | 1 | -0/+1 |
| |/ | | | | | | | I added my project ProfaneDB, it is a database for Protocol Buffers objects. Written in C++, it uses gRPC as an interface for other languages. It is still work in progress, but I'd love to get some feedback on it while I progress! | ||||
| * | Add getClass for php Descriptor in c extension (#3443) | Paul Yang | 2017-08-02 | 3 | -1/+16 |
| | | |||||
| * | Fixing HHVM Compatibility (#3437) | Ryan Gordon | 2017-08-02 | 1 | -4/+2 |
| | | |||||
| * | Expose descriptor API in php c extension (#3422) | Paul Yang | 2017-08-02 | 8 | -27/+841 |
| | | |||||
| * | Change divideInt64ToInt32 to static (#3436) | Tony Wong | 2017-08-01 | 1 | -1/+1 |
| | | | | | | | | | | divideInt64ToInt32 is called statically from protobuf/php/src/Google/Protobuf/Internal/CodedOutputStream.php (the only reference) This causes fatal error in PHP 7.1 (32-bit only because 64-bit doesn't use this function) | ||||
| * | Removes unnecessary pass-by-references in PHP internal classes (#3433) | Brent Shaffer | 2017-08-01 | 3 | -10/+10 |
| | | |||||
| * | Merge pull request #3429 from king6cong/master | Feng Xiao | 2017-07-31 | 2 | -1/+8 |
| |\ | | | | | | | Add classpath for java example Makefile | ||||
| | * | Add classpath for java example Makefile | king6cong | 2017-07-31 | 2 | -1/+8 |
| |/ | |||||
| * | Merge pull request #3421 from thomasvl/update_comment | Thomas Van Lenten | 2017-07-26 | 3 | -5/+9 |
| |\ | | | | | | | Update the comment on the message_type to cover what it should be. | ||||
| | * | Update the comment on the message_type to cover what it should be. | Thomas Van Lenten | 2017-07-26 | 3 | -5/+9 |
| |/ | |||||
| * | Merge pull request #3420 from thomasvl/objc_proto2_conformance | Thomas Van Lenten | 2017-07-26 | 3 | -23/+26 |
| |\ | | | | | | | Objc proto2 conformance test support | ||||
| | * | Review feedback. | Thomas Van Lenten | 2017-07-26 | 1 | -8/+6 |
| | | | | | | | | | | | | | | | - Better error message for unknown messageType. - Remove unneeded if. | ||||
| | * | Add the proto2 message conformance support for ObjC. | Thomas Van Lenten | 2017-07-26 | 1 | -10/+12 |
| | | | |||||
| | * | Generate the proto2 test file and link it in for ObjC. | Thomas Van Lenten | 2017-07-26 | 1 | -9/+11 |
| | | | |||||
| | * | Add a objc_class_prefix to test_messages_proto3.proto. | Thomas Van Lenten | 2017-07-26 | 2 | -3/+4 |
| |/ | | | | | | | | | | | | | | | | | | | Both test_messages_proto3.proto & test_messages_proto2.proto define message ForeignMessage {...} and enum ForeignEnum {...} but since objc doesn't use the proto package in the naming, these end up conflicting. Adding the objc_class_prefix option to the proto3 file ensure the generated objc types are all unique. | ||||
| * | Merge pull request #3410 from adam-26/1745 | Adam Cozzette | 2017-07-25 | 1 | -0/+1 |
| |\ | | | | | | | Fix issue #1745 - javascript allow dot in filename | ||||
| | * | Fix quotation marks | Adam | 2017-07-24 | 1 | -1/+1 |
| | | | |||||
| | * | Fix issue #1745 - javascript allow dot in filename | Adam | 2017-07-24 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #3450 from pherl/invalidoffset | Jisi Liu | 2017-08-03 | 15 | -144/+315 |
|\ \ \ | | | | | | | | | Fix invalid offsetof warning. | ||||
| * | | | Fix invalid offsetof warning. | Jisi Liu | 2017-08-03 | 15 | -144/+315 |
| | | | | | | | | | | | | | | | | Use composition instead of inheritance for oneof default. | ||||
* | | | | Merge pull request #3451 from pherl/fixtypo | Jisi Liu | 2017-08-03 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Fix typo. | ||||
| * | | | Fix typo. | Jisi Liu | 2017-08-03 | 1 | -1/+1 |
|/ / / | |||||
* | | | Add destructors for default instances to the shutdown code. | Gerben Stavenga | 2017-08-02 | 16 | -73/+152 |
| | | | | | | | | | | | | Verified test succeed under draconian heap checker | ||||
* | | | Merge pull request #3442 from pherl/csharpversion | Jisi Liu | 2017-08-02 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Bump csharp version | ||||
| * | | | Bump csharp version | Jisi Liu | 2017-08-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3438 from pherl/changelog | Jisi Liu | 2017-08-02 | 1 | -0/+128 |
|\| | | | | | | | | | | | Update change log | ||||
| * | | | Update change log | Jisi Liu | 2017-08-01 | 1 | -0/+128 |
| | | | | |||||
* | | | | Merge pull request #3419 from pherl/3.4.x | Jisi Liu | 2017-08-01 | 85 | -1295/+3022 |
|\| | | | | | | | | | | | Merge master into 3.4.x | ||||
| * | | | remove the duplication | Jisi Liu | 2017-08-01 | 1 | -1/+0 |
| | | | | |||||
| * | | | Adding the missing header | Jisi Liu | 2017-08-01 | 1 | -0/+1 |
| | | | | |||||
| * | | | Export functions in io_win32.h in win DLL build | Jisi Liu | 2017-08-01 | 1 | -13/+14 |
| | | | | | | | | | | | | | | | | | | | | Previous code duplicates io_win32.cc in sources of all the libraries that include io_win32.h header. | ||||
| * | | | Update conformance tests again. | Jisi Liu | 2017-07-25 | 3 | -3/+4 |
| | | | | |||||
| * | | | Fix makefile.am | Jisi Liu | 2017-07-25 | 3 | -0/+5 |
| | | | | |||||
| * | | | Fix conformance tests | Jisi Liu | 2017-07-25 | 2 | -4/+4 |
| | | | | |||||
| * | | | Fix build files | Jisi Liu | 2017-07-25 | 5 | -7/+3 |
| | | | | |||||
| * | | | Remove dependency on guava 20 | Jisi Liu | 2017-07-25 | 2 | -14/+10 |
| | | | | |||||
| * | | | Update conformance tests | Jisi Liu | 2017-07-25 | 3 | -5/+6 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into merge | Jisi Liu | 2017-07-25 | 2 | -2/+3 |
| |\| | | |||||
| | * | | need for php math functions. used in mergeFromJsonString (#3409) | Sergey | 2017-07-25 | 1 | -0/+3 |
| | | | | |||||
| | * | | Merge pull request #3407 from bklarson/master | Adam Cozzette | 2017-07-25 | 15 | -1/+29 |
| | |\ \ | | | | | | | | | | | Add declaration for AddDescriptorsImpl() | ||||
| | | * | | Put AddDescriptorsImpl() in anonymous namespace | Brad Larson | 2017-07-24 | 14 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AddDescriptorsImpl() is a private static implementation detail, and needs to be declared but won't be used from outside the source file. Place it inside an anonymous namespace to fix a previous build error that would result in more restrictive build enviornments that use -Werror=missing-declarations or similar compiler flags. | ||||
| | | * | | Add -Werror=missing-declarations to test builds | Brad Larson | 2017-07-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat missing declarations as an error for test builds, to prevent future updates which add functions without properly declaring them. This will prevent broken builds in more restrictive build environments. | ||||
| | * | | | Fix cycle dependency for repeated field not collected by gc (#3399) | Paul Yang | 2017-07-25 | 8 | -64/+243 |
| | | | | | |||||
| | * | | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChong | Yilun Chong | 2017-07-24 | 27 | -1073/+1523 |
| | |\ \ \ | | | |_|/ | | |/| | | Proto2 test message support to conformance test | ||||
| | | * | | add comments in makefile.am | Yilun Chong | 2017-07-05 | 1 | -1/+2 |
| | | | | |