Commit Graph

5204 Commits

Author SHA1 Message Date
Jisi Liu
62616e1522 Update changelog 2017-12-19 15:22:18 -08:00
Jisi Liu
96810dea74 Merge branch '3.5.x' of github.com:google/protobuf into changelog 2017-12-19 14:50:32 -08:00
Jisi Liu
eff55ece08
Merge pull request #4074 from pherl/mapat
Replace C++11 only method std::map::at
2017-12-19 14:41:13 -08:00
Jisi Liu
9ce29bd566
Merge pull request #4070 from pherl/3.5.x
Update version number to 3.5.1
2017-12-19 12:21:21 -08:00
Jisi Liu
501093d778 Replace C++11 only method std::map::at 2017-12-19 12:20:13 -08:00
Jisi Liu
7bd1606484 Update changelog for 3.5.1 2017-12-19 11:28:30 -08:00
Jisi Liu
050fc9a437 Update version number to 3.5.1 2017-12-19 11:00:33 -08:00
Feng Xiao
3a06fe1fc9 Fix file permission for python package.
`umask 0022` makes sure the created package will be accessible by all users.
2017-12-15 12:57:26 -08:00
Paul Yang
c79ba5c1b6
Merge pull request #4034 from TeBoring/php-timestamp-bug
Avoid calling method from php extension directly
2017-12-15 10:36:07 -08:00
Adam Cozzette
269884a1eb
Merge pull request #4040 from bazurbat/3.5.x
Create containing directory before generating well_known_types_embed.cc
2017-12-15 10:27:30 -08:00
Bo Yang
8d6f13e86d Fix for php5.5 2017-12-14 13:24:00 -08:00
Jisi Liu
d971cbfc27
Merge pull request #4049 from pherl/py26
Remove py2.6 support.
2017-12-14 11:51:34 -08:00
Bo Yang
39159c89f1 Accept DatetimeInterface in fromDatetime 2017-12-14 11:33:34 -08:00
Jisi Liu
acadade56e Remove py2.6 support. 2017-12-14 11:26:58 -08:00
Bo Yang
1a549d9a90 Avoid using php_date_get_date_ce() in case date extension is not
available.
2017-12-13 17:09:55 -08:00
Jisi Liu
82724e2109
Merge pull request #4042 from pherl/cpp_enum
Use matching enum type for IsPOD.
2017-12-13 13:29:18 -08:00
Jisi Liu
8521624e93
Merge pull request #4043 from pherl/flush
Explicitly propagate the status of Flush().
2017-12-13 13:28:23 -08:00
Jisi Liu
6b01e6440c Explicitly propagate the status of Flush().
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.
2017-12-13 13:06:29 -08:00
Jisi Liu
7ef21dd81b Use matching enum type for IsPOD. 2017-12-13 13:00:02 -08:00
Oleg Kolosov
edcf15e7f4 Create containing directory before generating well_known_types_embed.cc
This fixes the following build error:

oldpwd=`pwd` && cd .../protobuf/src && \
$oldpwd/js_embed google/protobuf/compiler/js/well_known_types/any.js google/protobuf/compiler/js/well_known_types/struct.js google/protobuf/compiler/js/well_known_types/timestamp.js > $oldpwd/google/protobuf/compiler/js/well_known_types_embed.cc
/bin/bash: line 1: .../protobuf/target/src/google/protobuf/compiler/js/well_known_types_embed.cc: No such file or directory
Makefile:8201: recipe for target 'google/protobuf/compiler/js/well_known_types_embed.cc' failed

which is observed during the cross-compilation since the version 3.2.
2017-12-13 12:37:24 +01:00
Bo Yang
fffe8d39f8 Call php method via function name instead of calling directly.
This changes the linking error if php extension is not statically linked
to a runtime error. In this way, users who don't need Timestamp can
still use protobuf even if date extension is not statically linked in
php.
2017-12-12 17:47:04 -08:00
Paul Yang
f69a5db66f
Merge pull request #4028 from TeBoring/3.5.x
Add backslach to make class explict in global namespace
2017-12-12 14:28:27 -08:00
Bo Yang
88102eae8f Replace private timelib_update_ts with public date_timestamp_get 2017-12-12 13:57:49 -08:00
Bo Yang
9f6aceaa8c Add PROTOBUF_ENABLE_TIMESTAMP to let user decide whether timestamp util
can be used at install time.
2017-12-12 12:06:51 -08:00
Paul Yang
b1386e77a2
Merge pull request #4026 from TeBoring/3.5.x
Merge 3.5.0.1 to 3.5.x
2017-12-11 15:46:44 -08:00
Bo Yang
3b13c3f02e Add backslach to make class explict in global namespace 2017-12-11 15:44:27 -08:00
Bo Yang
fc5818b2bb Merge branch '3.5.0.1' into 3.5.x 2017-12-11 10:50:50 -08:00
Paul Yang
cf7c15e31a
Fix ruby gc_test in ruby 2.4 (#4011)
* Fix ruby gc_test in ruby 2.4

* Initialize global variables to Qnil.
2017-12-08 12:38:25 -08:00
Paul Yang
0e7b589566
Add discard unknown API in ruby. (#3990)
* 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
2017-12-07 14:18:38 -08:00
Paul Yang
c370f88fb1
Recursively clear unknown fields in submessages. (#3982)
* 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.
2017-12-07 11:16:47 -08:00
Jisi Liu
1b5b3b2839
Merge pull request #4013 from laszlocsomor/io_win32
io_win32: support non-ASCII paths
2017-12-07 11:16:08 -08:00
Laszlo Csomor
a3a1c93fb4 io_win32_unittest: remove incorrect error check
Unlike GetEnvironmentVariableW,
GetCurrentDirectoryW doesn't set
ERROR_INSUFFICIENT_BUFFER.
2017-12-07 15:31:49 +01:00
Laszlo Csomor
eb3bd6ec29 io_win32_unittest: fix condition in GetCwdAsUtf8 2017-12-07 15:31:49 +01:00
Laszlo Csomor
3f1b1a6da5 io_win32_unittest: use CWD as last tempdir
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
6de51caed5
and what was then changed by commit
792d098769
2017-12-07 15:31:49 +01:00
Laszlo Csomor
57a01c7fbe io_win32: add more encoding-related tests 2017-12-07 15:31:49 +01:00
Laszlo Csomor
65da9fd97f io_win32: support non-ASCII paths
Fixes https://github.com/google/protobuf/issues/3951
2017-12-07 15:31:49 +01:00
Laszlo Csomor
953a0253fc io_win32_unittest: make //:win32_test run again
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
2017-12-07 15:31:49 +01:00
Bo Yang
457f6a607c Add release log 2017-12-06 10:54:11 -08:00
Bo Yang
ba60b854b6 Update php c extension version number to 3.5.0.1 2017-12-06 10:46:57 -08:00
Bo Yang
212563d756 Fix memory leak in php7 2017-12-06 10:40:07 -08:00
Bo Yang
3b7a5f4515 Fix several more memory leak 2017-12-06 10:38:18 -08:00
Bo Yang
7d3437152a Fix memory leak when creating map field via array. 2017-12-06 10:37:53 -08:00
Bo Yang
e0d3aa057b Fix memory leak when creating repeated field via array. 2017-12-06 10:37:26 -08:00
Paul Yang
de44982a74 Remove duplicate typedef. (#3975) 2017-12-06 10:36:52 -08:00
Bo Yang
b140cb3145 Fix memory leak when creating map field via array. 2017-12-04 12:32:10 -08:00
Bo Yang
1acacf46cc Fix memory leak when creating repeated field via array. 2017-12-01 20:14:57 -08:00
Paul Yang
94bb1eed17
Remove duplicate typedef. (#3975) 2017-11-30 12:21:00 -08:00
Paul Yang
74e7decbbf
Provide discardUnknonwnFields API in php (#3976)
* Provide discardUnknownFields API in php implementation

* Provide discardUnknownFields API in php c extension.
2017-11-30 12:19:50 -08:00
Jisi Liu
cf65a7946f Update version for 3.5.0.post1 2017-11-22 14:05:10 -08:00
Jisi Liu
f466709e7d
Merge pull request #3941 from google/anandolee-patch-2
Add _file_desc_by_toplevel_extension back
2017-11-22 14:01:02 -08:00