aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix issue #1745 - javascript allow dot in filenameAdam2017-07-241-0/+1
|
* Merge pull request #2969 from laszlocsomor/masterFeng Xiao2017-07-2419-81/+970
|\ | | | | Windows: support long paths in open/mkdir/access
| * Windows: support long pathsLaszlo Csomor2017-07-1119-81/+970
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add implementations of open(2), mkdir(2), stat(2), etc. that support long paths under Windows (paths longer than MAX_PATH in <windows.h>, which is 260 characters). The implementations are in a separate namespace (google::protobuf::internal::win32), so they won't collide with the standard implementations in <io.h>, but after importing them with `using` they can be drop-in replacements. Fixes https://github.com/bazelbuild/bazel/issues/2634 Fixes https://github.com/google/protobuf/issues/2891
* | Merge pull request #3403 from ax3l/topic-cmake-pkgconfigAdam Cozzette2017-07-244-0/+30
|\ \ | | | | | | CMake: Install .pc Files
| * | Travis: Exclude CMake .pc filesAxel Huebl2017-07-231-0/+1
| | | | | | | | | | | | | | | | | | Exclude the unconfigured .pc input files of the CMake based install: they shall not be packed/distributed, only their outputs are
| * | CMake: Install .pc FilesAxel Huebl2017-07-233-0/+29
|/ / | | | | | | Adds pkg-config (`.pc`) files for CMake based installs.
* | Merge pull request #3401 from aschrijver/patch-2Adam Cozzette2017-07-211-1/+1
|\ \ | | | | | | Updated outdated hyperlink
| * | Updated outdated hyperlinkArnold Schrijver2017-07-211-1/+1
|/ / | | | | Github repo had moved, pointing to correct location.
* | Merge pull request #3179 from bjwatson/fix-duration-typoFeng Xiao2017-07-201-2/+2
|\ \ | | | | | | Fix typos in comment
| * | Fix typos in commentBrian J. Watson2017-06-211-2/+2
| | |
* | | Merge pull request #3397 from acozzette/initializationAdam Cozzette2017-07-2015-75/+26
|\ \ \ | | | | | | | | Fixed default instance initialization for C++ lite
| * | | Fixed dynamic initialization for C++ liteAdam Cozzette2017-07-1915-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.
* | | | Merge pull request #3262 from snnn/masterJie Luo2017-07-193-5/+11
|\ \ \ \ | |/ / / |/| | | Make it compatible with python 3.6.1
| * | | Fix a bazel build error on WindowsChangming Sun2017-06-223-5/+11
| |/ /
* | | compiles removal of newline (#3333) (#3370)Brent Shaffer2017-07-1925-25/+0
| | |
* | | Merge pull request #3375 from TeBoring/3.3.xPaul Yang2017-07-1954-88/+259
|\ \ \ | | | | | | | | Merge 3.3.x into master
| * \ \ Merge 3.3.x into masterBo Yang2017-07-1854-88/+259
| |\ \ \
| | * \ \ Merge pull request #3258 from TeBoring/3.3.xv3.3.23.3.xPaul Yang2017-06-2128-30/+46
| | |\ \ \ | | | | | | | | | | | | Update version number to 3.3.2
| | | * | | Update C++ generated code.Bo Yang2017-06-2113-13/+13
| | | | | |
| | | * | | Update version number to 3.3.2Bo Yang2017-06-2115-17/+33
| | |/ / /
| | * | | Merge pull request #3255 from TeBoring/3.3.x-3Paul Yang2017-06-2010-7/+28
| | |\ \ \ | | | | | | | | | | | | Cherry-pick bug fixes for php
| | | * | | Remove inclusion of ext/json/php_json.h. (#3241)Jeff Ching2017-06-201-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 Yang2017-06-203-1/+17
| | | | | |
| | | * | | Add ARRAY for reserved name (#3150)Paul Yang2017-06-206-5/+11
| | |/ / /
| | * | | Merge pull request #3085 from scpeters/issue_3059Feng Xiao2017-05-1914-0/+59
| | |\ \ \ | | | | | | | | | | | | Use bool deterministic to suppress warning
| | | * | | regenerate plugin and profile message codeSteven Peters2017-05-112-0/+4
| | | | | |
| | | * | | Use bool deterministic to suppress warningSteven Peters2017-05-1113-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #3059 by re-applying 08b1c718 from #3087.
| | * | | | Update jenkins Java deps.v3.3.1Feng Xiao2017-05-121-1/+1
| | | | | |
| | * | | | Revert guava depedency to version 19.Feng Xiao2017-05-123-27/+14
| | |/ / /
| | * | | Add LICENSE in package.xml (#3083)Paul Yang2017-05-111-0/+1
| | | | |
| | * | | Merge pull request #3074 from xfxyjwf/3.3.xFeng Xiao2017-05-1128-30/+46
| | |\ \ \ | | | | | | | | | | | | Update version number to 3.3.1
| | | * | | Update C++ generated code.Feng Xiao2017-05-0813-13/+13
| | | | | |
| | | * | | Update version number to 3.3.1Feng Xiao2017-05-0815-17/+33
| | | | | |
| | * | | | Fix upb load descriptor when no messages defined in prorto. (#3080)Paul Yang2017-05-111-0/+3
| | | | | |
| | * | | | Fix c extension for php7.1. (#3077)Paul Yang2017-05-104-25/+98
| | |/ / /
| | * | | Merge pull request #3073 from xfxyjwf/3.3.xFeng Xiao2017-05-081-1/+2
| | |\ \ \ | | | | | | | | | | | | Cherry-pick a bug fix: workaround gcc < 4.5.0 bug
| | | * | | Workaround gcc < 4.5.0 bugMario J. Rugiero2017-05-081-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-typeFeng Xiao2017-05-081-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | | Fix offset type macro to match the tables it is used in
| | | * | | Fix compilationrandomguy32017-05-061-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 inAlex Merry2017-05-051-1/+1
| | |/ / /
| | * | | Merge pull request #3057 from xfxyjwf/3.3.xFeng Xiao2017-05-057-5/+18
| | |\ \ \ | | | | | | | | | | | | Fix several C++ build issues.
| | | * | | Add missing LIBRPOTOC_EXPORT.Feng Xiao2017-05-041-2/+2
| | | | | |
| | | * | | Skip C# test in C++ only distribution.Feng Xiao2017-05-041-0/+8
| | | | | |
| | | * | | Add missing files to build files.Feng Xiao2017-05-045-3/+8
| | | | | |
| | * | | | Merge pull request #3056 from acozzette/cherry-pick-pr-2873Adam Cozzette2017-05-053-14/+14
| | |\ \ \ \ | | | |/ / / | | |/| | | Cherry-pick the fix from pull request #2873
| | | * | | Fix #1562 by using goog.crypt.byteArrayToString instead of ↵Paul Jolly2017-05-043-14/+14
| | |/ / / | | | | | | | | | | | | | | | String.fromCharCode.apply
| | * | | Merge pull request #3055 from chrisn-arm/3.3.xFeng Xiao2017-05-041-0/+7
| | |\ \ \ | | | | | | | | | | | | Fix compilation on alpine 3.5
| | | * | | Fix issue 3046: compilation on alpine 3.5Chris Nix2017-05-041-0/+7
| | |/ / /
* | | | | Merge pull request #3390 from danielgtaylor-isp/patch-1Feng Xiao2017-07-181-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Add note about includes to README
| * | | | | Add note about includes to READMEDaniel Taylor2017-07-181-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.