Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4361 from BSBandme/go_benchmark | Yilun Chong | 2018-03-20 | 9 | -15/+243 |
|\ | | | | | Add go benchmark | ||||
| * | Change to deal all messages in one loop | Yilun Chong | 2018-03-19 | 1 | -18/+19 |
| | | |||||
| * | Rewrite go_benchmark | BSBandme | 2018-03-14 | 2 | -95/+82 |
| | | |||||
| * | some fix | BSBandme | 2018-03-13 | 2 | -35/+36 |
| | | |||||
| * | Add go benchmark | BSBandme | 2018-03-07 | 9 | -15/+254 |
| | | |||||
* | | Merge pull request #4345 from jskeet/list-json-null | Feng Xiao | 2018-03-20 | 3 | -2/+37 |
|\ \ | | | | | | | Allow null value in JSON representation of ListValue | ||||
| * | | Add conformance test for null value in list JSON | Jon Skeet | 2018-03-01 | 1 | -0/+18 |
| | | | |||||
| * | | Allow list values to be null when parsing | Jon Skeet | 2018-03-01 | 2 | -2/+19 |
| |/ | |||||
* | | Merge pull request #4397 from pherl/catlog | Jisi Liu | 2018-03-19 | 1 | -1/+1 |
|\ \ | | | | | | | Cat the test-suite.log on errors for presubmits | ||||
| * | | Cat the test-suite.log on errors for presubits | Jisi Liu | 2018-03-19 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #4371 from Rasrack/gnuc_minor | Adam Cozzette | 2018-03-15 | 1 | -1/+1 |
|\ \ | | | | | | | Fix spelling error of __GNUC_MINOR__ | ||||
| * | | Fix spelling error of __GNUC_MINOR__ | Adam Aili | 2018-03-10 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #4370 from felixjendrusch/objc-output-stream-write-check | Thomas Van Lenten | 2018-03-14 | 2 | -1/+14 |
|\ \ \ | | | | | | | | | Objective-C: Check return value on write of raw pointer | ||||
| * | | | Check return value on write of raw pointer | Felix Jendrusch | 2018-03-08 | 1 | -1/+4 |
| | | | | |||||
| * | | | Add test for failing write of raw pointer to output stream | Felix Jendrusch | 2018-03-08 | 1 | -0/+10 |
| | | | | |||||
* | | | | Merge pull request #4222 from JohnHBrock/increasing_max_csharp_message_size | Feng Xiao | 2018-03-14 | 2 | -3/+86 |
|\ \ \ \ | | | | | | | | | | | Remove 64MB memory limit when deserializing messages in C# | ||||
| * | | | | Remove 64MB memory limit when deserializing messages in C# | John Brock | 2018-01-31 | 2 | -3/+86 |
| | | | | | | | | | | | | | | | | | | | | Increased `CodedInputStream.DefaultSizeLimit` to `Int32.MaxValue` to make it consistent with the Java implementation. | ||||
* | | | | | Merge pull request #4310 from KindDragon/patch-1 | Feng Xiao | 2018-03-14 | 1 | -6/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Support using MSVC intrinsics in Log2FloorNonZero | ||||
| * | | | | | Support using MSVC intrinsics in Log2FloorNonZero | Arkady Shapkin | 2018-02-15 | 1 | -6/+9 |
| | | | | | | |||||
* | | | | | | Merge pull request #4378 from acozzette/node-buffer | Adam Cozzette | 2018-03-13 | 1 | -0/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Revert "Removed mention of Buffer in byteSourceToUint8Array" | ||||
| * | | | | | | Revert "Removed mention of Buffer in byteSourceToUint8Array" | Adam Cozzette | 2018-03-09 | 1 | -0/+4 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f00e06c95bc117fb2ed0ca56c96041c93039f1fe. Although Node Buffers are not covered by the tests, it seems that there are users relying on them, so we need to add back in support for them. This fixes issue #4359. | ||||
* | | | | | | Merge pull request #4167 from mike9005/patch-1 | Joshua Haberman | 2018-03-13 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Ruby: Fix scope resolution for MessageExts | ||||
| * | | | | | | Fix scope resolution for MessageExts in Ruby | Michael Collis | 2018-01-12 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4380 from mateuszmatejczyk/patch-1 | Jisi Liu | 2018-03-12 | 1 | -3/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Output *_pb2_grpc.py files when use_grpc_plugin=True | ||||
| * | | | | | | | Output *_pb2_grpc.py when use_grpc_plugin=True | Mateusz Matejczyk | 2018-03-11 | 1 | -3/+6 |
| | |/ / / / / | |/| | | | | | | | | | | | | Start outputting missing *_pb2_grpc.py files when use_grpc_plugin is set to True for py_proto_library. | ||||
* | | | | | | | Merge pull request #1333 from cgull/pkg-config-issue | Jisi Liu | 2018-03-12 | 3 | -400/+487 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Replace ancient m4/acx_pthread.m4 with m4/ax_pthread.m4 | ||||
| * | | | | | | Replace ancient m4/acx_pthread.m4 with m4/ax_pthread.m4 | john hood | 2016-03-18 | 3 | -400/+487 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4347 from xfxyjwf/pluginpb | Feng Xiao | 2018-03-09 | 4 | -3/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources." | ||||
| * | | | | | | | Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources." | Feng Xiao | 2018-03-01 | 4 | -3/+3 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | This reverts commit 724f0be33d0eb42055ebe81ce0c8c7bf88ea666c. | ||||
* | | | | | | | Merge pull request #4375 from jo2y/protoc-default | Feng Xiao | 2018-03-09 | 2 | -5/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Replace //:protoc and similar default macro arguments with | ||||
| * | | | | | | | Replace //:protoc and similar default macro arguments with | James O'Kane | 2018-03-08 | 2 | -5/+5 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @com_google_protobuf prefixed versions. This allows them to work in 3rd party repositories. Fix a bad visibility rule. :hidden does not exist, but :private does. | ||||
* | | | | | / | Sync upb change (#4373) | Paul Yang | 2018-03-08 | 2 | -195/+2783 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Convert descriptortype to type for upb_msgval_sizeof (#4357) | Paul Yang | 2018-03-06 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | For encoding upb needs descriptor type instead of type. (#4354) | Paul Yang | 2018-03-06 | 2 | -13/+13 |
| | | | | | | |||||
* | | | | | | Merge pull request #4355 from acozzette/typo | Adam Cozzette | 2018-03-05 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | PHP: fixed typo in message.c | ||||
| * | | | | | PHP: fixed typo in message.c | Adam Cozzette | 2018-03-05 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #4183 from pcc/win-libcxx | Feng Xiao | 2018-02-26 | 2 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Add support for libc++ on Windows. | ||||
| * | | | | | Add support for libc++ on Windows. | Peter Collingbourne | 2018-01-17 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This disables a couple of workarounds which are only necessary with MSVC's standard library and cause problems with libc++. | ||||
* | | | | | | Merge pull request #4333 from jmillikin/update-file-lists-needs-bash | Feng Xiao | 2018-02-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | `update_file_lists.sh` depends on Bash features, thus needs Bash sebang. | ||||
| * | | | | | | `update_file_lists.sh` depends on Bash features, thus needs Bash sebang. | John Millikin | 2018-02-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I noticed that running this script as `./update_file_lists.sh` on MacOS was corrupting `cmake/extract_includes.bat.in`. Forcing the shell to Bash fixes the generated file output. | ||||
* | | | | | | | Merge pull request #4334 from jmillikin/blacklist-internal-proto-srcs | Feng Xiao | 2018-02-26 | 4 | -3/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation. | ||||
| * | | | | | | | Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation. | John Millikin | 2018-02-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the Bazel `CcProtoAspect` from generating and linking C++ object code for these files. Without this blacklist, symbols for protobuf types depended on by `libprotobuf` may be defined multiple times and violate the ODR rule. Fixes https://github.com/google/protobuf/issues/4311 | ||||
| * | | | | | | | Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources. | John Millikin | 2018-02-24 | 4 | -3/+3 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets all values of `WELL_KNOWN_PROTOS` be treated the same with regard to Bazel's protobuf blacklisting. | ||||
* | | | | | | | Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJson | Feng Xiao | 2018-02-26 | 5 | -6/+72 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Adds an option in C++ JSON parser to ignore unrecognized enum values | ||||
| * | | | | | | | The JsonParseOptions::ignore_unknown_fields option behavior treats | Alexey Malov | 2018-02-12 | 5 | -6/+72 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | unrecognized string values in enum fields as default ones. | ||||
* | | | | | | | Merge pull request #4291 from google/3.5.x | Jisi Liu | 2018-02-26 | 12 | -61/+189 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Merge 3.5.x to master | ||||
| * | | | | | | Merge pull request #4236 from pherl/3.5.x | Jisi Liu | 2018-01-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Bumping number to fix ruby 2.1 on mac | ||||
| | * | | | | | | Bumping number to fix ruby 2.1 on mac | Jisi Liu | 2018-01-26 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fix more memory leak for php c extension (#4211) | Paul Yang | 2018-01-25 | 7 | -27/+117 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix more memory leak for php c extension * Fix memory leak for php5.5 | ||||
| * | | | | | | Merge pull request #4185 from pherl/ruby2.5 | Jisi Liu | 2018-01-17 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update rake file to build of 2.1.6. |