Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | Merge pull request #4013 from laszlocsomor/io_win32 | Jisi Liu | 2017-12-07 | 3 | -126/+274 |
|\ | | | | | io_win32: support non-ASCII paths | ||||
| * | io_win32_unittest: remove incorrect error check | Laszlo Csomor | 2017-12-07 | 1 | -3/+3 |
| | | | | | | | | | | | | Unlike GetEnvironmentVariableW, GetCurrentDirectoryW doesn't set ERROR_INSUFFICIENT_BUFFER. | ||||
| * | io_win32_unittest: fix condition in GetCwdAsUtf8 | Laszlo Csomor | 2017-12-07 | 1 | -1/+1 |
| | | |||||
| * | io_win32_unittest: use CWD as last tempdir | Laszlo Csomor | 2017-12-07 | 1 | -3/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | If the test cannot find a temp directory by checking environment variables, it will fall back to using the current working directory as the temp directory root. This is what the test used to do as of commit https://github.com/google/protobuf/commit/6de51caed52d798815954646b230c5aef3e4d2fc and what was then changed by commit https://github.com/google/protobuf/pull/3978/commits/792d098769d8e000d8d474c8ffd201d2eabc2134 | ||||
| * | io_win32: add more encoding-related tests | Laszlo Csomor | 2017-12-07 | 3 | -31/+89 |
| | | |||||
| * | io_win32: support non-ASCII paths | Laszlo Csomor | 2017-12-07 | 3 | -89/+176 |
| | | | | | | | | Fixes https://github.com/google/protobuf/issues/3951 | ||||
| * | io_win32_unittest: make //:win32_test run again | Laszlo Csomor | 2017-12-07 | 1 | -49/+29 |
|/ | | | | | | | | | Do not use "googletest.h", apprently that leads to linking errors on Windows which I couldn't figure out how to solve, and decided to just go with plain gTest instead. See https://github.com/google/protobuf/issues/3951 | ||||
* | 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 |
| | |||||
* | 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 for 3.5.0.post1 | Jisi Liu | 2017-11-22 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3941 from google/anandolee-patch-2 | Jisi Liu | 2017-11-22 | 1 | -1/+10 |
|\ | | | | | Add _file_desc_by_toplevel_extension back | ||||
| * | Add _file_desc_by_toplevel_extension back | Jie Luo | 2017-11-22 | 1 | -1/+10 |
|/ | | | | | | Add _file_desc_by_toplevel_extension back for compatibility issue with 3.4.1. _file_desc_by_toplevel_extension is a temporary solution for FieldDescriptor.file. FieldDescriptor.file was added in code gen. However, we need to keep it for some time for compatibility reason (with 3.4.1 only). May try to remove it after 2 years. | ||||
* | Update version number for php c extension (#3896) | Paul Yang | 2017-11-15 | 2 | -4/+20 |
| | |||||
* | Merge pull request #3895 from pherl/3.5.x | Jisi Liu | 2017-11-15 | 1 | -1/+1 |
|\ | | | | | Add protobuf-all in post release | ||||
| * | Add protobuf-all in post release | Jisi Liu | 2017-11-15 | 1 | -1/+1 |
| | | |||||
* | | Use fully qualifed name for DescriptorPool in Any.php to avoid name (#3886) | Paul Yang | 2017-11-15 | 1 | -4/+3 |
|/ | | | conflict | ||||
* | Update protoc-artfacts | Jisi Liu | 2017-11-13 | 1 | -5/+6 |
| | |||||
* | Merge branch '3.5.x' of github.com:google/protobuf into 3.5.x | Jisi Liu | 2017-11-13 | 5 | -9/+67 |
|\ | |||||
| * | Merge pull request #3868 from pherl/3.5.xv3.5.0 | Jisi Liu | 2017-11-13 | 13 | -29/+22 |
| |\ | | | | | | | Support win32 long path for cross compiled build | ||||
| * | | All integer types should accept null in json. (#3869) | Paul Yang | 2017-11-13 | 2 | -5/+22 |
| | | | |||||
| * | | Merge pull request #3867 from jtattermusch/update_changelog | Jisi Liu | 2017-11-10 | 1 | -0/+1 |
| |\ \ | | | | | | | | | Update changelog | ||||
| | * | | update changelog | Jan Tattermusch | 2017-11-10 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge pull request #3861 from jtattermusch/backport_3858 | Jisi Liu | 2017-11-10 | 2 | -4/+44 |
| |\ \ | | | | | | | | | Backport #3858 to 3.5.x branch | ||||
| | * | | ParseFrom<T> for array slice is missing | Jan Tattermusch | 2017-11-10 | 1 | -0/+14 |
| | | | | |||||
| | * | | check already performed by MergeFrom | Jan Tattermusch | 2017-11-10 | 1 | -5/+0 |
| | | | | |||||
| | * | | allow message parsing from an array slice | Jan Tattermusch | 2017-11-10 | 2 | -0/+31 |
| |/ / | |||||
* | / | Update release date | Jisi Liu | 2017-11-13 | 1 | -3/+3 |
| |/ |/| | |||||
* | | Support win32 long path for cross compiled build | Jisi Liu | 2017-11-10 | 13 | -29/+22 |
|/ | |||||
* | Fix arm64 name | Jisi Liu | 2017-11-09 | 1 | -2/+2 |
| | |||||
* | Supports Arm64 (aarch64) protoc artifacts | Jisi Liu | 2017-11-09 | 2 | -1/+16 |
| | |||||
* | Merge pull request #3854 from pherl/3.5.x | Jisi Liu | 2017-11-08 | 4 | -131/+2 |
|\ | | | | | Fix Atomic32/AtomicWord on some platforms. | ||||
| * | Fix Atomic32/AtomicWord on some platforms. | Jisi Liu | 2017-11-08 | 4 | -131/+2 |
| | | | | | | | | | | | | | | | | | | | | - Removed the redefination in the atomicword_compat.h. Now Atomic32 will alwyas be intptr_t in 32bit platforms, the bridge is no longer needed. - Change NaCl 64bit to use intptr_t instead of int32 for Atomic32, otherwise AtmoicWord APIs will miss the definations. After this change, the AtmoicWord will always be either Atomic32 or Atmoic64 depending on the platforms. | ||||
* | | Provide util funtions to figure out correct php class names. (#3850) | Paul Yang | 2017-11-08 | 2 | -9/+36 |
|/ | |||||
* | Merge pull request #3835 from pherl/3.5.x | Jisi Liu | 2017-11-08 | 26 | -43/+118 |
|\ | | | | | Update version number to 3.5.0 | ||||
| * | Fix java code example | Jisi Liu | 2017-11-08 | 1 | -2/+2 |
| | | |||||
| * | Changelog for 3.5.0 | Jisi Liu | 2017-11-08 | 1 | -0/+75 |
| | | |||||
| * | Update generated descritpors. | Jisi Liu | 2017-11-02 | 12 | -24/+24 |
| | | |||||
| * | Update version number to 3.5.0 | Jisi Liu | 2017-11-02 | 13 | -19/+19 |
| | | |||||
* | | Fix php well known type conformance tests (#3828) (#3840) | Paul Yang | 2017-11-04 | 12 | -164/+520 |
|/ | | | | | | | | | | | | | | | * 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 | ||||
* | Fix merging with message-valued oneof | Jon Skeet | 2017-10-31 | 13 | -12/+417 |
| | | | | | | | | | | If messages A and B have the same oneof case, which is a message type, and we merge B into A, those sub-messages should be merged. Fixes #3200. Note that I haven't regenerated all the code, as some of the protos have been changed, breaking generation. | ||||
* | Merge pull request #3817 from xuwei-k/joda-url | Feng Xiao | 2017-10-30 | 4 | -4/+4 |
|\ | | | | | update joda-time javadoc url | ||||
| * | update joda-time javadoc url | xuwei-k | 2017-10-30 | 4 | -4/+4 |
|/ | |||||
* | Add parser settings WithXyz methods | Jon Skeet | 2017-10-28 | 1 | -0/+17 |
| | |||||
* | Add JsonParser setting to ignore unknown field values | Jon Skeet | 2017-10-28 | 4 | -7/+95 |
| | | | | | | | Note that the default behavior is still to throw an exception; you need to opt into ignoring unknown fields. Fixes #2838. | ||||
* | Merge pull request #3722 from timou/cmake-windows-clean | Jisi Liu | 2017-10-27 | 1 | -1/+20 |
|\ | | | | | Suppress VS2017 compiler/linker warnings | ||||
| * | Sort MSVC warning suppressions | Tim Ebringer | 2017-10-21 | 1 | -1/+17 |
| | | | | | | | | Add brief documentation describing each warning suppression. | ||||
| * | Suppress VS2017 compiler/linker warnings | Tim Ebringer | 2017-10-06 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | VS2017 warns about a few additional things, for example, files that define no symbols (which is typically the result of a platform specific ifdef not applying on Windows). Suppress these warnings so the build is clean on VS2017. |