aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Reserve unknown fields in php (#3659)Paul Yang2017-10-0912-841/+2101
| | | | | | | | | | | | | | | | | | | | | | * Reserve unknown fields in upb 1) For decoding, an unknownfields will be lazily created on message, which contains bytes of unknown fields. 2) For encoding, if the unknownfields is present on message, all bytes contained in it will be serialized. * Register the function to encode unknown field at decode time. * Remove upb_handlers_setaddunknown * Use upb_sink_putunknown in decoder * Remove upb_pb_encoder_encode_unknown * Do not expose encode_unknown * Implement reserve unknown field in php Implement. * Make buffer private to CodedInputStream
* Add well known types to php runtime. (#3697)Paul Yang2017-10-0543-144/+5450
| | | | | | | | | | | | | | | | | | | | | | | * Add well known types to php runtime. * Fix php7.0 tests * No longer generate empty.proto in test as it has been included in runtime. * Fix zts build * Clean code * Rename g_p_b_empty to empty. * Don't generate code for empty.proto in compatibility test * Fix 32-bit * Fix mac build * Fix Makefile.am to add new files
* Fix ruby segment fault (#3708)Paul Yang2017-10-038-9/+88
| | | | | | | | | | | | | | | | * Fix ruby segment fault 1) rb_ary_new cannot be called during allocate function. During allocate fucntion, the containing object hasn't been marked and rb_ary_new may invoke gc to collect containing object. 2) The global map should be marked before allocating it. Otherwise it may be garbage collected. * Add test * Remove commented code * Fix grammer error
* Merge pull request #3714 from thomasvl/objc_increase_test_coverageThomas Van Lenten2017-10-0311-42/+524
|\ | | | | Objc increase test coverage
| * Build out more complete code coverage in the tests.Thomas Van Lenten2017-10-035-36/+494
| |
| * Let Xcode 9 update project/scheme settings.Thomas Van Lenten2017-10-036-6/+30
|/
* Merge pull request #3710 from thomasvl/xcode9Thomas Van Lenten2017-10-021-0/+6
|\ | | | | Add Xcode 9 support to the helper script.
| * Add Xcode 9 support to the helper script.Thomas Van Lenten2017-10-021-0/+6
| |
* | Merge pull request #3709 from thomasvl/unknown_field_merge_issueThomas Van Lenten2017-10-022-11/+21
|\ \ | |/ |/| ObjC: Fix merging of length delimited unknown fields.
| * ObjC: Fix merging of length delimited unknown fields.Thomas Van Lenten2017-10-022-11/+21
|/ | | | | - Add a test to cover this and tweak the test to not use two merge paths to be sure things are as expected.
* Use constexpr more with VC++ 2017 (#3707)Bruce Dawson2017-10-021-1/+2
| | | | | | | | | | | | | * Use constexpr more with VC++ 2017 Chrome's official builds have over 170 dynamic initializers for variables of the form *::TableStruct::aux. Defining PROTOBUF_CONSTEXPR_VAR to be constexpr for VS 2017 gets rid of all of these and saves about 10 KB of binary size. * Update generated_message_table_driven.h Restore accidentally deleted line.
* Merge pull request #3676 from hesmar/hesmar/fixProtobufGeneratePythonFeng Xiao2017-09-251-2/+2
|\ | | | | generate python code when calling PROTOBUF_GENERATE_PYTHON
| * generate python code when calling PROTOBUF_GENERATE_PYTHONMarkus Heß2017-09-251-2/+2
|/
* Enforce all error report for php tests. (#3670)Paul Yang2017-09-225-5/+25
| | | | | | * Enforce all error report for php tests. * Import vendor/autoload.php in tests/bootstrap_phpunit.php
* Merge pull request #3675 from hesmar/hesmar/cmakeAddDllExportFeng Xiao2017-09-222-4/+11
|\ | | | | protobuf_generate: add EXPORT_MACRO option
| * protobuf_generate: add EXPORT_MACRO optionMarkus Heß2017-09-222-4/+11
|/
* Merge pull request #3674 from pherl/shutdownJisi Liu2017-09-211-0/+2
|\ | | | | Test Shutdown can be called multiple times.
| * Test Shutdown can be called multiple times.Jisi Liu2017-09-211-0/+2
| |
* | Merge pull request #3627 from zanker/zanker/add-submsg-hash-initJoshua Haberman2017-09-215-26/+116
|\ \ | |/ |/| Allow initializing a chain of protos using only a hash in Ruby
| * Update message.cZachary Anker2017-09-211-2/+1
| |
| * Allow initializing a chain of protos using only a hashZachary Anker2017-09-205-26/+117
| |
* | Add $ before url_prefix_len to make it a variable. (#3668)Paul Yang2017-09-201-4/+2
| | | | | | | | | | | | | | | | * Add $ before url_prefix_len to make it a variable. * Remove unnecessary string length check * Remove useless $type_url_len
* | Merge pull request #3639 from zanker/zanker/fix-embedded-to_hJoshua Haberman2017-09-203-3/+22
|\ \ | | | | | | Fixed to_h with repeated messages to return hashes in Ruby
| * | Update message.cZachary Anker2017-09-201-1/+1
| | |
| * | Fixed to_h with repeated messages to return hashes in RubyZachary Anker2017-09-203-3/+22
| | |
* | | Merge pull request #2377 from mcos/chore/conformance-null-testsFeng Xiao2017-09-191-0/+8
|\ \ \ | | | | | | | | Conformance Tests for Null Timestamp and Duration JSON Values
| * | | Add tests to demonstrate json parsing for null Timestamp and Duration typesMark Costello2016-11-161-0/+8
| | | |
* | | | Merge pull request #3624 from acozzette/down-integrateAdam Cozzette2017-09-18173-13998/+14541
|\ \ \ \ | |_|/ / |/| | | Integrated internal changes from Google
| * | | Integrated internal changes from GoogleAdam Cozzette2017-09-14173-13998/+14541
|/ / /
* | | Merge pull request #3626 from xfxyjwf/fixgoFeng Xiao2017-09-132-4/+4
|\ \ \ | | | | | | | | Fix go example test.
| * | | Fix go example test.Feng Xiao2017-09-132-4/+4
| | | | | | | | | | | | | | | | It needs "-I" flag to find imported file google/protobuf/timestamp.proto
* | | | Merge pull request #3635 from drivehappy/clang_cleanupFeng Xiao2017-09-131-1/+1
|\ \ \ \ | | | | | | | | | | Clang warning cleanup for unused parameter.
| * | | | Clang warning cleanup for unused parameter.drivehappy2017-09-131-1/+1
|/ / / /
* | | | Merge pull request #3158 from yeswalrus/fix-policy-warningFeng Xiao2017-09-131-2/+2
|\ \ \ \ | |_|_|/ |/| | | Fix policy warning CMP0054
| * | | Fix policy warning CMP0054Walter Gray2017-05-301-2/+2
| | | |
* | | | Merge pull request #3621 from jtattermusch/upport_3596Jan Tattermusch2017-09-121-1/+1
|\ \ \ \ | |_|/ / |/| | | Google.Protobuf should target net45 (upport to upstream/master)
| * | | Google.Protobuf should target net45Jan Tattermusch2017-09-121-1/+1
| | | |
* | | | Merge pull request #3618 from hesmar/fix_protobuf_generateFeng Xiao2017-09-121-7/+12
|\ \ \ \ | |/ / / |/| | | fix protobuf_generate function
| * | | fix protobuf_generate functionMarkus Heß2017-09-121-7/+12
| | | |
* | | | Merge pull request #3613 from xfxyjwf/bazel_examplesFeng Xiao2017-09-1114-89/+352
|\ \ \ \ | |/ / / |/| | | Add bazel support for examples.
| * | | Exclude addressbook.proto from C# boostrap test.Feng Xiao2017-09-112-6/+0
| | | | | | | | | | | | | | | | | | | | This addressbook.proto now belongs to its own bazel pacakge and can't be accessed in bazel protobuf_test target.
| * | | Update C# generated file for addressbook.protoFeng Xiao2017-09-111-11/+47
| | | |
| * | | Update examples file list.Feng Xiao2017-09-111-6/+7
| | | |
| * | | Add bazel support for examples.Feng Xiao2017-09-0810-66/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example utilizes native bazel rules (proto_library, cc_proto_library, java_proto_library, java_lite_proto_library) to show how easy it is to build protobuf with bazel's native support. It also makes use of well known types which was not possible until the latest bazel 0.5.4 release and https://github.com/google/protobuf/pull/3594 .
* | | | Add well-known timestamps to JSON for PHP (#3564)Jack Wakefield2017-09-106-61/+146
|/ / /
* | | Merge pull request #2576 from cristicbz/py-strutilFeng Xiao2017-09-081-1/+11
|\ \ \ | | | | | | | | python: do not include internal 'strutil.h' header
| * | | python: do not include internal 'strutil.h' headerCristi Cobzarenco2017-01-281-1/+11
| | | |
* | | | Merge pull request #3590 from NanXiao/patch-1Adam Cozzette2017-09-061-0/+2
|\ \ \ \ | | | | | | | | | | Update autogen.sh
| * | | | Update autogen.shNan Xiao2017-09-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the bug in following scenario: gmock is downloaded successfully while gtest not. Resuming "autogen.sh", the gtest won't be downloaded. And following error will occur: $ ./autogen.sh + autoreconf -f -i -Wall,no-obsolete aclocal: error: configure.ac:1: file 'gtest/m4/acx_pthread.m4' does not exist autoreconf: aclocal failed with exit status: 1
* | | | | Add native php support for Duration. (#3583)Paul Yang2017-09-057-0/+261
| | | | |