aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #4040 from bazurbat/3.5.xAdam Cozzette2017-12-151-0/+1
|\ \ | | | | | | Create containing directory before generating well_known_types_embed.cc
| * | Create containing directory before generating well_known_types_embed.ccOleg Kolosov2017-12-131-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | This fixes the following build error: oldpwd=`pwd` && cd .../protobuf/src && \ $oldpwd/js_embed google/protobuf/compiler/js/well_known_types/any.js google/protobuf/compiler/js/well_known_types/struct.js google/protobuf/compiler/js/well_known_types/timestamp.js > $oldpwd/google/protobuf/compiler/js/well_known_types_embed.cc /bin/bash: line 1: .../protobuf/target/src/google/protobuf/compiler/js/well_known_types_embed.cc: No such file or directory Makefile:8201: recipe for target 'google/protobuf/compiler/js/well_known_types_embed.cc' failed which is observed during the cross-compilation since the version 3.2.
* | Merge pull request #4049 from pherl/py26Jisi Liu2017-12-141-1/+0
|\ \ | | | | | | Remove py2.6 support.
| * | Remove py2.6 support.Jisi Liu2017-12-141-1/+0
| | |
* | | Merge pull request #4042 from pherl/cpp_enumJisi Liu2017-12-131-9/+9
|\ \ \ | | | | | | | | Use matching enum type for IsPOD.
| * | | Use matching enum type for IsPOD.Jisi Liu2017-12-131-9/+9
| | | |
* | | | Merge pull request #4043 from pherl/flushJisi Liu2017-12-131-2/+2
|\ \ \ \ | |_|/ / |/| | | Explicitly propagate the status of Flush().
| * | | Explicitly propagate the status of Flush().Jisi Liu2017-12-131-2/+2
|/ / / | | | | | | | | | | | | | | | | | | Before the change, an implicit Flush() will be triggered in the destructor of the input stream. However, the return code of Flush() is not discarded. This change makes sure when Flush() fails, we will return false.
* | | Merge pull request #4028 from TeBoring/3.5.xPaul Yang2017-12-121-1/+1
|\ \ \ | |_|/ |/| | Add backslach to make class explict in global namespace
| * | Add backslach to make class explict in global namespaceBo Yang2017-12-111-1/+1
| | |
* | | Merge pull request #4026 from TeBoring/3.5.xPaul Yang2017-12-116-7/+66
|\ \ \ | |/ / |/| | Merge 3.5.0.1 to 3.5.x
| * | Merge branch '3.5.0.1' into 3.5.xBo Yang2017-12-116-7/+66
|/| |
| * | Add release logv3.5.0.1Bo Yang2017-12-061-0/+16
| | |
| * | Update php c extension version number to 3.5.0.1Bo Yang2017-12-062-4/+4
| | |
| * | Fix memory leak in php7Bo Yang2017-12-063-5/+11
| | |
| * | Fix several more memory leakBo Yang2017-12-064-6/+27
| | |
| * | Fix memory leak when creating map field via array.Bo Yang2017-12-062-2/+6
| | |
| * | Fix memory leak when creating repeated field via array.Bo Yang2017-12-062-2/+6
| | |
| * | Remove duplicate typedef. (#3975)Paul Yang2017-12-061-19/+7
| | |
* | | Fix ruby gc_test in ruby 2.4 (#4011)Paul Yang2017-12-083-13/+13
| | | | | | | | | | | | | | | | | | * Fix ruby gc_test in ruby 2.4 * Initialize global variables to Qnil.
* | | Add discard unknown API in ruby. (#3990)Paul Yang2017-12-076-0/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add discard unknown API in ruby. * Add test for oneof message field. * Add TestUnknown to represent unknown field data clearly. * Only serialize the message with unknown fields itself in test. * Move discard_unknown from Message to Google.Protobuf
* | | Recursively clear unknown fields in submessages. (#3982)Paul Yang2017-12-073-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_win32Jisi Liu2017-12-073-126/+274
|\ \ \ | | | | | | | | io_win32: support non-ASCII paths
| * | | io_win32_unittest: remove incorrect error checkLaszlo Csomor2017-12-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Unlike GetEnvironmentVariableW, GetCurrentDirectoryW doesn't set ERROR_INSUFFICIENT_BUFFER.
| * | | io_win32_unittest: fix condition in GetCwdAsUtf8Laszlo Csomor2017-12-071-1/+1
| | | |
| * | | io_win32_unittest: use CWD as last tempdirLaszlo Csomor2017-12-071-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 testsLaszlo Csomor2017-12-073-31/+89
| | | |
| * | | io_win32: support non-ASCII pathsLaszlo Csomor2017-12-073-89/+176
| | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3951
| * | | io_win32_unittest: make //:win32_test run againLaszlo Csomor2017-12-071-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 Yang2017-12-042-2/+6
| | |
* | | Fix memory leak when creating repeated field via array.Bo Yang2017-12-012-2/+6
| | |
* | | Remove duplicate typedef. (#3975)Paul Yang2017-11-301-19/+7
| | |
* | | Provide discardUnknonwnFields API in php (#3976)Paul Yang2017-11-305-0/+27
| |/ |/| | | | | | | | | * Provide discardUnknownFields API in php implementation * Provide discardUnknownFields API in php c extension.
* | Update version for 3.5.0.post1Jisi Liu2017-11-221-1/+1
| |
* | Merge pull request #3941 from google/anandolee-patch-2Jisi Liu2017-11-221-1/+10
|\ \ | | | | | | Add _file_desc_by_toplevel_extension back
| * | Add _file_desc_by_toplevel_extension backJie Luo2017-11-221-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 Yang2017-11-152-4/+20
| |
* | Merge pull request #3895 from pherl/3.5.xJisi Liu2017-11-151-1/+1
|\ \ | | | | | | Add protobuf-all in post release
| * | Add protobuf-all in post releaseJisi Liu2017-11-151-1/+1
| | |
* | | Use fully qualifed name for DescriptorPool in Any.php to avoid name (#3886)Paul Yang2017-11-151-4/+3
|/ / | | | | conflict
* | Update protoc-artfactsJisi Liu2017-11-131-5/+6
| |
* | Merge branch '3.5.x' of github.com:google/protobuf into 3.5.xJisi Liu2017-11-135-9/+67
|\|
| * Merge pull request #3868 from pherl/3.5.xv3.5.0Jisi Liu2017-11-1313-29/+22
| |\ | | | | | | Support win32 long path for cross compiled build
| * | All integer types should accept null in json. (#3869)Paul Yang2017-11-132-5/+22
| | |
| * | Merge pull request #3867 from jtattermusch/update_changelogJisi Liu2017-11-101-0/+1
| |\ \ | | | | | | | | Update changelog
| | * | update changelogJan Tattermusch2017-11-101-0/+1
| |/ /
| * | Merge pull request #3861 from jtattermusch/backport_3858Jisi Liu2017-11-102-4/+44
| |\ \ | | | | | | | | Backport #3858 to 3.5.x branch
| | * | ParseFrom<T> for array slice is missingJan Tattermusch2017-11-101-0/+14
| | | |
| | * | check already performed by MergeFromJan Tattermusch2017-11-101-5/+0
| | | |
| | * | allow message parsing from an array sliceJan Tattermusch2017-11-102-0/+31
| |/ /
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 07:58:33 +0000