aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | 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
| | | | | |
* | | | | | Merge pull request #4116 from amandeepgautam/masterAdam Cozzette2018-01-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | whitelisting aix platform as it has sched_yield
| * | | | | | whitelisting aix platform as it has sched_yieldAmandeep Gautam2018-01-031-1/+1
| |/ / / / /
* | | | | / Force a copy when saving the NSData that came from another.Thomas Van Lenten2018-01-031-1/+6
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #4014 from BSBandme/JavaCaliperYilun Chong2018-01-037-338/+489
|\ \ \ \ \ | | | | | | | | | | | | Add caliper supported to java benchmark
| * | | | | Fix some bugYilun Chong2018-01-021-0/+0
| | | | | |
| * | | | | Changed READMEYilun Chong2018-01-021-11/+12
| | | | | |
| * | | | | add cppYilun Chong2017-12-143-16/+23
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/google/protobuf into JavaCaliperYilun Chong2017-12-1368-510/+3708
| |\ \ \ \ \
| * | | | | | fix bugsYilun Chong2017-12-134-4/+4
| | | | | | |
| * | | | | | Fix bugsYilun Chong2017-12-137-157/+81
| | | | | | |
| * | | | | | Add caliper supported to java benchmarkYilun Chong2017-12-129-335/+554
| | | | | | |
* | | | | | | Properly copy maps with string keys but pod values.Thomas Van Lenten2018-01-033-1/+74
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Add tests to cover all the common special casing in the runtime code to ensure things come out correctly.
* | | | | | Resolved issue #3510. Malformed errorr messages replaced with meaningful ↵kvukic2017-12-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | description
* | | | | | Merge pull request #4083 from matt-kwong/kokoro_jobsFeng Xiao2017-12-2130-0/+390
|\ \ \ \ \ \ | | | | | | | | | | | | | | Shard 64-bit Linux languages into different Kokoro jobs
| * | | | | | Shard 64-bit Linux languages into different Kokoro jobsMatt Kwong2017-12-2030-0/+390
| | | | | | |
* | | | | | | Merge pull request #4082 from matt-kwong/kokoro_jobsFeng Xiao2017-12-2011-0/+685
|\| | | | | | | | | | | | | | | | | | | | Migrate Jenkins jobs to Kokoro
| * | | | | | Collect xml results for KokoroMatt Kwong2017-12-206-2/+26
| | | | | | |
| * | | | | | Make Kokoro job pull Dockerimage from DockerhubMatt Kwong2017-12-202-11/+14
| | | | | | |
| * | | | | | Migrate Jenkins jobs to KokoroMatt Kwong2017-12-1911-0/+658
| | | | | | |
* | | | | | | Merge pull request #4077 from mkamilov/masterJisi Liu2017-12-201-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add support for Windows ARM64 build
| * | | | | | | Add support for Windows ARM64 buildMiradham Kamilov2017-12-191-0/+3
| |/ / / / / /
* | | | | | | Merge pull request #4030 from cyyber/masterFeng Xiao2017-12-202-13/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Calling Keychecker before checking key in MessageMap
| * | | | | | | Calling Keychecker before checking key in MessageMapcyyber2017-12-152-13/+7
| | | | | | | |
* | | | | | | | Merge pull request #4068 from wsw2016/fix_4032Adam Cozzette2017-12-202-1/+27
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | resolved issue 4032 and added a unit test
| * | | | | | | line breaks adjstedUbuntu2017-12-201-5/+12
| | | | | | | |