aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| |/ /
* | / Update release dateJisi Liu2017-11-131-3/+3
| |/ |/|
* | Support win32 long path for cross compiled buildJisi Liu2017-11-1013-29/+22
|/
* Fix arm64 nameJisi Liu2017-11-091-2/+2
|
* Supports Arm64 (aarch64) protoc artifactsJisi Liu2017-11-092-1/+16
|
* Merge pull request #3854 from pherl/3.5.xJisi Liu2017-11-084-131/+2
|\ | | | | Fix Atomic32/AtomicWord on some platforms.
| * Fix Atomic32/AtomicWord on some platforms.Jisi Liu2017-11-084-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 Yang2017-11-082-9/+36
|/
* Merge pull request #3835 from pherl/3.5.xJisi Liu2017-11-0826-43/+118
|\ | | | | Update version number to 3.5.0
| * Fix java code exampleJisi Liu2017-11-081-2/+2
| |
| * Changelog for 3.5.0Jisi Liu2017-11-081-0/+75
| |
| * Update generated descritpors.Jisi Liu2017-11-0212-24/+24
| |
| * Update version number to 3.5.0Jisi Liu2017-11-0213-19/+19
| |
* | Fix php well known type conformance tests (#3828) (#3840)Paul Yang2017-11-0412-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 oneofJon Skeet2017-10-3113-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-urlFeng Xiao2017-10-304-4/+4
|\ | | | | update joda-time javadoc url
| * update joda-time javadoc urlxuwei-k2017-10-304-4/+4
|/
* Add parser settings WithXyz methodsJon Skeet2017-10-281-0/+17
|
* Add JsonParser setting to ignore unknown field valuesJon Skeet2017-10-284-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-cleanJisi Liu2017-10-271-1/+20
|\ | | | | Suppress VS2017 compiler/linker warnings
| * Sort MSVC warning suppressionsTim Ebringer2017-10-211-1/+17
| | | | | | | | Add brief documentation describing each warning suppression.
| * Suppress VS2017 compiler/linker warningsTim Ebringer2017-10-061-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.
* | Reserve unknown in Ruby (#3763)Paul Yang2017-10-2612-832/+2034
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reserve unknown in ruby * Revert ruby tests. Wait for cpp impl for conformance test * Add conformance test for preserving unknown * Add unknown field conformance test to csharp failure list. * Fix comments * Fix comment * Fix comments * Fix typo * Use stringsink_string directly * Mark hd unused * Remove unused encodeunknown_handlerfunc
* | Add missing filesJisi Liu2017-10-261-0/+38
| |
* | Merge pull request #3804 from pherl/mergeJisi Liu2017-10-263-2/+7
|\ \ | | | | | | Merge 3.4.x into master before cutting 3.5.x
| * \ Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-253-2/+7
| |\ \
| | * \ Merge pull request #3758 from spinorx/3.4.xJisi Liu2017-10-201-43/+2
| | |\ \ | | | | | | | | | | [v3.4.x branch] Fix iOS cc_library build for protobuf.