Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed dynamic initialization for C++ lite | Adam Cozzette | 2017-07-19 | 15 | -75/+26 |
| | | | | | | | | | | | | | | An ifdef condition seems to have been inverted by mistake, causing the dynamic initialization to occur for lite if and only if the _NO_STATIC_INITIALIZER macro is set. This problem manifested itself as segfaults due to uninitialized empty strings: https://github.com/google/protobuf/issues/2839 Since no one complained about initialization not happening, it would appear that we can just disable this initialization for lite unconditionally, so that is what this change does. Instead of the default instance initialization happening pre-main, it now always happens lazily when needed. | ||||
* | compiles removal of newline (#3333) (#3370) | Brent Shaffer | 2017-07-19 | 25 | -25/+0 |
| | |||||
* | Merge pull request #3375 from TeBoring/3.3.x | Paul Yang | 2017-07-19 | 54 | -88/+259 |
|\ | | | | | Merge 3.3.x into master | ||||
| * | Merge 3.3.x into master | Bo Yang | 2017-07-18 | 54 | -88/+259 |
| |\ | |||||
| | * | Merge pull request #3258 from TeBoring/3.3.xv3.3.23.3.x | Paul Yang | 2017-06-21 | 28 | -30/+46 |
| | |\ | | | | | | | | | Update version number to 3.3.2 | ||||
| | | * | Update C++ generated code. | Bo Yang | 2017-06-21 | 13 | -13/+13 |
| | | | | |||||
| | | * | Update version number to 3.3.2 | Bo Yang | 2017-06-21 | 15 | -17/+33 |
| | |/ | |||||
| | * | Merge pull request #3255 from TeBoring/3.3.x-3 | Paul Yang | 2017-06-20 | 10 | -7/+28 |
| | |\ | | | | | | | | | Cherry-pick bug fixes for php | ||||
| | | * | Remove inclusion of ext/json/php_json.h. (#3241) | Jeff Ching | 2017-06-20 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | That implementation of json is not being used - this extension is using a json encoder/decoder provided by 'upb'. | ||||
| | | * | Oneof field should be serialized even it's equal to default. (#3153) | Paul Yang | 2017-06-20 | 3 | -1/+17 |
| | | | | |||||
| | | * | Add ARRAY for reserved name (#3150) | Paul Yang | 2017-06-20 | 6 | -5/+11 |
| | |/ | |||||
| | * | Merge pull request #3085 from scpeters/issue_3059 | Feng Xiao | 2017-05-19 | 14 | -0/+59 |
| | |\ | | | | | | | | | Use bool deterministic to suppress warning | ||||
| | | * | regenerate plugin and profile message code | Steven Peters | 2017-05-11 | 2 | -0/+4 |
| | | | | |||||
| | | * | Use bool deterministic to suppress warning | Steven Peters | 2017-05-11 | 13 | -0/+55 |
| | | | | | | | | | | | | | | | | Fixes #3059 by re-applying 08b1c718 from #3087. | ||||
| | * | | Update jenkins Java deps.v3.3.1 | Feng Xiao | 2017-05-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | Revert guava depedency to version 19. | Feng Xiao | 2017-05-12 | 3 | -27/+14 |
| | |/ | |||||
| | * | Add LICENSE in package.xml (#3083) | Paul Yang | 2017-05-11 | 1 | -0/+1 |
| | | | |||||
| | * | Merge pull request #3074 from xfxyjwf/3.3.x | Feng Xiao | 2017-05-11 | 28 | -30/+46 |
| | |\ | | | | | | | | | Update version number to 3.3.1 | ||||
| | | * | Update C++ generated code. | Feng Xiao | 2017-05-08 | 13 | -13/+13 |
| | | | | |||||
| | | * | Update version number to 3.3.1 | Feng Xiao | 2017-05-08 | 15 | -17/+33 |
| | | | | |||||
| | * | | Fix upb load descriptor when no messages defined in prorto. (#3080) | Paul Yang | 2017-05-11 | 1 | -0/+3 |
| | | | | |||||
| | * | | Fix c extension for php7.1. (#3077) | Paul Yang | 2017-05-10 | 4 | -25/+98 |
| | |/ | |||||
| | * | Merge pull request #3073 from xfxyjwf/3.3.x | Feng Xiao | 2017-05-08 | 1 | -1/+2 |
| | |\ | | | | | | | | | Cherry-pick a bug fix: workaround gcc < 4.5.0 bug | ||||
| | | * | Workaround gcc < 4.5.0 bug | Mario J. Rugiero | 2017-05-08 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=189 Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com> | ||||
| | * | | Merge pull request #3064 from randomguy3/offset-type | Feng Xiao | 2017-05-08 | 1 | -1/+1 |
| | |\ \ | | | |/ | | |/| | Fix offset type macro to match the tables it is used in | ||||
| | | * | Fix compilation | randomguy3 | 2017-05-06 | 1 | -1/+1 |
| | | | | | | | | | | | | <: is a digraph, so a space is necessary for compilation on certain compilers. | ||||
| | | * | Fix offset type to match the tables it is used in | Alex Merry | 2017-05-05 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge pull request #3057 from xfxyjwf/3.3.x | Feng Xiao | 2017-05-05 | 7 | -5/+18 |
| | |\ | | | | | | | | | Fix several C++ build issues. | ||||
| | | * | Add missing LIBRPOTOC_EXPORT. | Feng Xiao | 2017-05-04 | 1 | -2/+2 |
| | | | | |||||
| | | * | Skip C# test in C++ only distribution. | Feng Xiao | 2017-05-04 | 1 | -0/+8 |
| | | | | |||||
| | | * | Add missing files to build files. | Feng Xiao | 2017-05-04 | 5 | -3/+8 |
| | | | | |||||
| | * | | Merge pull request #3056 from acozzette/cherry-pick-pr-2873 | Adam Cozzette | 2017-05-05 | 3 | -14/+14 |
| | |\ \ | | | |/ | | |/| | Cherry-pick the fix from pull request #2873 | ||||
| | | * | Fix #1562 by using goog.crypt.byteArrayToString instead of ↵ | Paul Jolly | 2017-05-04 | 3 | -14/+14 |
| | |/ | | | | | | | | | | String.fromCharCode.apply | ||||
| | * | Merge pull request #3055 from chrisn-arm/3.3.x | Feng Xiao | 2017-05-04 | 1 | -0/+7 |
| | |\ | | | | | | | | | Fix compilation on alpine 3.5 | ||||
| | | * | Fix issue 3046: compilation on alpine 3.5 | Chris Nix | 2017-05-04 | 1 | -0/+7 |
| | |/ | |||||
* | | | Merge pull request #3390 from danielgtaylor-isp/patch-1 | Feng Xiao | 2017-07-18 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Add note about includes to README | ||||
| * | | | Add note about includes to README | Daniel Taylor | 2017-07-18 | 1 | -0/+4 |
| | | | | | | | | | | | | Ran into an issue today where a machine had the `protoc` compiler but not the include files. Took a while to sort out, and this added note to the README included in every zip should help. | ||||
* | | | | Merge pull request #3385 from anandolee/master | Jie Luo | 2017-07-18 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance | ||||
| * | | | Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance test | Jie Luo | 2017-07-17 | 1 | -0/+1 |
| | | | | |||||
* | | | | Support PHP generic services (#3269) | Matt A | 2017-07-18 | 14 | -191/+623 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add php_generic_services option * Generate PHP generic services * Respect namespaces for generated PHP services * Test PHP generated services * Rename PHP generator service method doc comment function * Correct phpdoc service method case * Test namespaced PHP generic services * Always use the FQCN for PHP generic service input/output * Add generated_service_test to php test.sh * Add php service test protos to CI * Add php service files to php_EXTRA_DIST * Use Interface suffix for php generic services | ||||
* | | | Merge pull request #3348 from matthauck/fix-gcc41-again | Adam Cozzette | 2017-07-17 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Fix map_field_inl.h for gcc 4.1 | ||||
| * | | | Fix map_field_inl.h for gcc 4.1 | Matt Hauck | 2017-07-11 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #3357 from bklarson/master | Adam Cozzette | 2017-07-17 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Fix build when using -Werror=undef | ||||
| * | | | | Fix build when using -Werror=undef | Brad Larson | 2017-07-12 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a couple places where macros were being checked when they might not exist in some cases. Fixes #3356. | ||||
* | | | | | Merge pull request #3134 from lundefugl/javabug1 | Feng Xiao | 2017-07-17 | 2 | -5/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Issue 3112: Object class with fully qualified name | ||||
| * | | | | | Issue 3112: Object class with fully qualified name | lundefugl | 2017-05-24 | 2 | -5/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #3372 from dylanetaft/master | Adam Cozzette | 2017-07-17 | 1 | -1/+9 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Expand documentation in Readme.md | ||||
| * | | | | | Expand documentation in Readme.md | dylanetaft | 2017-07-15 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | Add some supporting documentation regarding Closure for those unfamiliar., Also substantiate details for "files in this directory" - including them all will result in a project that does not compile as some are used for test cases and aren't part of the core library. | ||||
* | | | | | | remove pass by reference for php setters (#3344) | Brent Shaffer | 2017-07-17 | 24 | -64/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove pass by reference for php setters * comments out memory leak test | ||||
* | | | | | | Fix Implicit Return Types (#3363) | Richard Fussenegger | 2017-07-17 | 1 | -2/+2 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | Both native_slot_merge and native_slot_merge_by_array have no return type declared. GCC implicitly uses int as return type in such cases, however, these functions are actually void. |