Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move parse frame array to the Map object | Aaron Patterson | 2017-08-30 | 5 | -23/+42 |
| | | | | This makes the frame stack per-parser, and per-thread. Fixes #3250 | ||||
* | Merge pull request #3547 from matt-kwong/kokoro_mac_build | Jisi Liu | 2017-08-23 | 1 | -1/+3 |
|\ | | | | | Remove pre-installed softwares from prebuild steps | ||||
| * | Remove pre-installed softwares | Matt Kwong | 2017-08-23 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #3548 from google/3.4.x | Jisi Liu | 2017-08-22 | 8 | -55/+42 |
|\ \ | |/ |/| | Merge fixes from 3.4.x into master | ||||
| * | Merge pull request #3546 from pherl/deathtest | Jisi Liu | 2017-08-22 | 2 | -39/+2 |
| |\ | | | | | | | Disable death tests on windows | ||||
| | * | Disable death tests on windows | Jisi Liu | 2017-08-22 | 2 | -39/+2 |
| |/ | | | | | | | Also remove cord related code | ||||
| * | Merge pull request #3537 from TeBoring/php-bug | Jisi Liu | 2017-08-22 | 5 | -1/+25 |
| |\ | | | | | | | Use message name as defined in php runtime. | ||||
| | * | Use message name as defined in php runtime. | Bo Yang | 2017-08-21 | 5 | -1/+25 |
| | | | |||||
| * | | Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1 | Jisi Liu | 2017-08-22 | 2 | -29/+33 |
| |\ \ | | | | | | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | ||||
| | * | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | Jisi Liu | 2017-08-21 | 2 | -29/+33 |
| | | | | | | | | | | | | Fixing unused parameter warnings under Clang. | ||||
| * | | | Merge pull request #3540 from drivehappy/3.4.x_clang_cleanup_2 | Jisi Liu | 2017-08-22 | 1 | -2/+5 |
| |\ \ \ | | |/ / | |/| | | Merge pull request #3494 from drivehappy/clang_warning_macro | ||||
| | * | | Merge pull request #3494 from drivehappy/clang_warning_macro | Jisi Liu | 2017-08-21 | 1 | -2/+5 |
| |/ / | | | | | | | Fixing -Wexpansion-to-defined Clang warning | ||||
| * | | Merge pull request #3536 from pherl/io32_11 | Jisi Liu | 2017-08-21 | 1 | -15/+15 |
| |\ \ | | |/ | |/| | Remove C++11 features in io_win32.cc | ||||
| | * | Fix compile errors | Jisi Liu | 2017-08-21 | 1 | -3/+3 |
| | | | |||||
| | * | Remove C++11 features in io_win32.cc | Jisi Liu | 2017-08-21 | 1 | -15/+15 |
| |/ | | | | | | | | | - Use scoped_array instead of unique_ptr. - Do not use string::front() and string::back() | ||||
* | | Merge pull request #3543 from tony612/patch-1 | Jisi Liu | 2017-08-22 | 1 | -0/+2 |
|\ \ | | | | | | | Add Elixir protobuf and gRPC to 3rd party doc | ||||
| * | | Add Elixir protobuf and gRPC to 3rd party doc | Bing Han | 2017-08-23 | 1 | -0/+2 |
|/ / | |||||
* | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | Jisi Liu | 2017-08-21 | 2 | -29/+33 |
|\ \ | | | | | | | Fixing unused parameter warnings under Clang. | ||||
| * | | Fixing unused parameter warnings under Clang. | drivehappy | 2017-08-21 | 2 | -29/+33 |
| | | | |||||
* | | | Merge pull request #3529 from pherl/merge3.4.x | Jisi Liu | 2017-08-21 | 310 | -8291/+21043 |
|\ \ \ | | | | | | | | | Merge 3.4.x into master | ||||
| * \ \ | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 | 310 | -8291/+21043 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Merge pull request #3528 from pherl/rubyfix | Jisi Liu | 2017-08-18 | 1 | -1/+1 |
| | |\ | | | | | | | | | Bump gemspec again | ||||
| | | * | Bump gemspec again | Jisi Liu | 2017-08-18 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge pull request #3504 from pherl/3.4.x | Jisi Liu | 2017-08-18 | 1 | -0/+3 |
| | |\ \ | | | |/ | | |/| | Prefer system distributed binaries/libraries. | ||||
| | | * | Prefer system distributed binaries/libraries. | Jisi Liu | 2017-08-16 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | It seems like the image has a /usr/local/bin/autoconf installed, which doesn't recognize/work with the yum installed libtools. Putting distributed binaries/libraries first solves the problem | ||||
| | * | | Merge pull request #3514 from pherl/rubyfix | Jisi Liu | 2017-08-17 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | Bump gem version for the next upload | ||||
| | | * | | Bump gem version for the next upload | Jisi Liu | 2017-08-17 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge pull request #3502 from pherl/pypi | Jisi Liu | 2017-08-17 | 1 | -6/+6 |
| | |\ \ \ | | | | | | | | | | | | | Update testpypi URLs | ||||
| | | * | | | clean up | Jisi Liu | 2017-08-16 | 1 | -3/+0 |
| | | | | | | |||||
| | | * | | | Update testpypi addresses. | Jisi Liu | 2017-08-16 | 1 | -6/+9 |
| | | |/ / | | | | | | | | | | | | | | | | The old one is deprecated and no longer working. | ||||
| | * | | | Update CHANGES.txt | Jie Luo | 2017-08-16 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Update CHANGES.txt | Jie Luo | 2017-08-16 | 1 | -1/+2 |
| | | |/ | | |/| | |||||
| | * | | Update php version number to 3.4.0 | Bo Yang | 2017-08-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update php c extension version number. | Bo Yang | 2017-08-16 | 2 | -3/+19 |
| | |/ | |||||
| | * | Merge pull request #3495 from pherl/c++11v3.4.0 | Jisi Liu | 2017-08-15 | 1 | -0/+19 |
| | |\ | | | | | | | | | Add std::forward and std::move autoconf check | ||||
| | | * | Add std::forward and std::move autoconf check | Jisi Liu | 2017-08-15 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | Protobuf now uses these two features, which are not available on some platforms. | ||||
| | * | | Merge pull request #3496 from pherl/mingw64 | Jisi Liu | 2017-08-15 | 2 | -4/+11 |
| | |\ \ | | | | | | | | | | | Static link pthread for mingw64 protoc and enable cross compile | ||||
| | | * | | Update readme | Jisi Liu | 2017-08-15 | 1 | -0/+6 |
| | | | | | |||||
| | | * | | static link for 32 bit build as well. | Jisi Liu | 2017-08-15 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Update comments that cross compile is feasible now | Jisi Liu | 2017-08-15 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | Need to install mingw-w64 on linux to cross compile | ||||
| | | * | | First try static linking pthread | Jisi Liu | 2017-08-15 | 1 | -2/+5 |
| | | |/ | |||||
| | * | | Merge pull request #3493 from pherl/cmath | Jisi Liu | 2017-08-15 | 1 | -6/+11 |
| | |\ \ | | | | | | | | | | | Fix cmath/math.h include with non C++11 libstdc++ | ||||
| | | * | | Fix cmath/math.h include with non C++11 libstdc++ | Jisi Liu | 2017-08-15 | 1 | -6/+11 |
| | | |/ | |||||
| | * | | Merge pull request #3488 from pherl/changelog | Jisi Liu | 2017-08-14 | 1 | -2/+3 |
| | |\ \ | | | |/ | | |/| | Update changelog for 3.4.x | ||||
| | | * | Update changelog for 3.4.x | Jisi Liu | 2017-08-14 | 1 | -2/+3 |
| | |/ | |||||
| | * | Merge pull request #3485 from pherl/mingwv3.4.0rc3 | Jisi Liu | 2017-08-11 | 13 | -15/+44 |
| | |\ | | | | | | | | | Fix build on MinGW32 | ||||
| | | * | Fix comments | Jisi Liu | 2017-08-11 | 2 | -1/+2 |
| | | | | |||||
| | | * | Add malloc cast | Jisi Liu | 2017-08-11 | 1 | -2/+2 |
| | | | | |||||
| | | * | implement remove strdup usage and implement our own | Jisi Liu | 2017-08-11 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | strdup is not part C or C++ standard but POXIS function. Several compilers failed to compile strdup or generate warnings. | ||||
| | | * | Adding missing imports for strdup | Jisi Liu | 2017-08-11 | 1 | -0/+1 |
| | | | |