Commit Graph

5131 Commits

Author SHA1 Message Date
Pavel
38fd94e184 CodedInputStream::SetTotalBytesLimit description fix 2017-10-12 15:00:19 +03:00
Jisi Liu
dd980ccf57 Fix distcheck 2017-10-11 15:10:54 -07:00
Jisi Liu
de15e73d58 Merge remote-tracking branch 'origin/3.4.x' into master 2017-10-11 14:44:03 -07:00
Juan Leni
08334f0908 Converting to immutable hashable types 2017-10-11 06:46:25 +02:00
Feng Xiao
c4083bb3d1 Merge pull request #3735 from sgreenstein/patch-1
Don't pass -lpthread and -lm on Windows
2017-10-10 11:11:36 -07:00
Seth Greenstein
68ee916221 Don't pass -lpthread and -lm on Windows
These flags are ignored by cl.exe and have no effect, but add noise to the build logs.
2017-10-10 11:08:27 -07:00
Paul Yang
6032746882 Reserve unknown fields in php (#3659)
* 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
2017-10-09 12:39:13 -07:00
Zearen Wover
d2a5f8b31d Update third_party.md 2017-10-09 14:39:06 -04:00
Tim Ebringer
2a72840425 Suppress VS2017 compiler/linker warnings
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.
2017-10-06 15:56:30 -04:00
Paul Yang
77f64bb777 Add well known types to php runtime. (#3697)
* 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
2017-10-05 21:03:57 -07:00
Paul Yang
cd5f49d094 Fix ruby segment fault (#3708)
* 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
2017-10-03 17:28:49 -07:00
Thomas Van Lenten
d6c32a818f Merge pull request #3714 from thomasvl/objc_increase_test_coverage
Objc increase test coverage
2017-10-03 13:43:50 -04:00
Thomas Van Lenten
a274c67caf Build out more complete code coverage in the tests. 2017-10-03 11:54:44 -04:00
Thomas Van Lenten
9477123538 Let Xcode 9 update project/scheme settings. 2017-10-03 09:56:02 -04:00
Thomas Van Lenten
4207066c35 Merge pull request #3710 from thomasvl/xcode9
Add Xcode 9 support to the helper script.
2017-10-02 20:14:50 -04:00
Thomas Van Lenten
c4dce018b2 Merge pull request #3709 from thomasvl/unknown_field_merge_issue
ObjC: Fix merging of length delimited unknown fields.
2017-10-02 20:14:12 -04:00
Thomas Van Lenten
b586e646a4 Add Xcode 9 support to the helper script. 2017-10-02 20:13:59 -04:00
Thomas Van Lenten
3f2dcaebe3 ObjC: Fix merging of length delimited unknown fields.
- Add a test to cover this and tweak the test to not use two merge
  paths to be sure things are as expected.
2017-10-02 19:56:25 -04:00
Bruce Dawson
210be267fd Use constexpr more with VC++ 2017 (#3707)
* 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.
2017-10-02 14:43:05 -07:00
Johan Brandhorst
fc7a6a2931 Add GopherJS protobuf and gRPC links
Add a link to my third party protobuf/gRPC implementation for GopherJS.
2017-10-02 21:48:34 +01:00
Jisi Liu
bd798dfc81 Merge pull request #3690 from pherl/3.4.x
Remove ranged based for in io_win32.cc
2017-10-02 10:53:06 -07:00
Jisi Liu
a38f876d40 Merge pull request #3691 from pherl/stringback
Fix C++11 string accessors
2017-09-29 10:24:32 -07:00
Markus Heß
f7e209951e protobuf_generate: create include path only for proto files 2017-09-29 11:07:36 +02:00
Jisi Liu
d2738c04f5 Add spaces 2017-09-27 10:56:19 -07:00
Jisi Liu
5a501c64c7 Fix C++11 string accessors 2017-09-27 10:33:04 -07:00
Jisi Liu
6d0cf1b3fe Remove ranged based for in io_win32.cc 2017-09-27 10:27:58 -07:00
Feng Xiao
fc5aa5d910 Merge pull request #3676 from hesmar/hesmar/fixProtobufGeneratePython
generate python code when calling PROTOBUF_GENERATE_PYTHON
2017-09-25 10:39:31 -07:00
Markus Heß
0e069e5a2d generate python code when calling PROTOBUF_GENERATE_PYTHON 2017-09-25 11:08:12 +02:00
Paul Yang
ae55fd2cc5 Enforce all error report for php tests. (#3670)
* Enforce all error report for php tests.

* Import vendor/autoload.php in tests/bootstrap_phpunit.php
2017-09-22 14:08:01 -07:00
Feng Xiao
c20440222a Merge pull request #3675 from hesmar/hesmar/cmakeAddDllExport
protobuf_generate: add EXPORT_MACRO option
2017-09-22 11:38:19 -07:00
Markus Heß
9829b8f511 protobuf_generate: add EXPORT_MACRO option 2017-09-22 11:44:59 +02:00
Jisi Liu
c627530946 Merge pull request #3674 from pherl/shutdown
Test Shutdown can be called multiple times.
2017-09-21 15:24:31 -07:00
Joshua Haberman
4fc75296c7 Merge pull request #3627 from zanker/zanker/add-submsg-hash-init
Allow initializing a chain of protos using only a hash in Ruby
2017-09-21 15:08:45 -07:00
Jisi Liu
b091bfb07b Test Shutdown can be called multiple times. 2017-09-21 14:08:01 -07:00
Zachary Anker
633ef8bde9 Update message.c 2017-09-21 09:26:54 -07:00
Paul Yang
2b0ee3fdf6 Add $ before url_prefix_len to make it a variable. (#3668)
* Add $ before url_prefix_len to make it a variable.

* Remove unnecessary string length check

* Remove useless $type_url_len
2017-09-20 22:59:13 -07:00
Joshua Haberman
eade82c836 Merge pull request #3639 from zanker/zanker/fix-embedded-to_h
Fixed to_h with repeated messages to return hashes in Ruby
2017-09-20 15:35:28 -07:00
Zachary Anker
8eae3fe6e9 Update message.c 2017-09-20 12:45:42 -07:00
Zachary Anker
87714836e3 Allow initializing a chain of protos using only a hash 2017-09-20 11:39:46 -07:00
Zachary Anker
83264bd160 Fixed to_h with repeated messages to return hashes in Ruby 2017-09-20 11:38:05 -07:00
Feng Xiao
cf1b29dec8 Merge pull request #2377 from mcos/chore/conformance-null-tests
Conformance Tests for Null Timestamp and Duration JSON Values
2017-09-19 22:35:27 -07:00
Adam Cozzette
fa5a69e73b Merge pull request #3624 from acozzette/down-integrate
Integrated internal changes from Google
2017-09-18 08:34:54 -07:00
Jisi Liu
655cc830d9 Merge pull request #3651 from pherl/3.4.x
Bumping minor version for ruby gems
2017-09-15 14:27:31 -07:00
Jisi Liu
2eb1bacc26 Bumping minor version for ruby gems 2017-09-15 13:57:16 -07:00
Paul Yang
5dd818cd22 Merge pull request #3612 from TeBoring/php-bug
Add prefix to php reserved keywords.
2017-09-15 09:20:23 -07:00
Jisi Liu
b04e5cba35 Merge pull request #3642 from pherl/3.4.x
Bump version for minor release
2017-09-14 12:24:28 -07:00
Jisi Liu
dba647a6b2 Bump version for minor release 2017-09-14 11:12:55 -07:00
drivehappy
e3be1febf2 Clang warning cleanup for unused parameter. 2017-09-14 10:14:57 -07:00
Adam Cozzette
13fd045dbb Integrated internal changes from Google 2017-09-14 10:03:57 -07:00
Feng Xiao
d1bc27caef Merge pull request #3626 from xfxyjwf/fixgo
Fix go example test.
2017-09-13 17:57:10 -07:00