Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #177 from tekn0ir/fix_libssl_example | Jaeseung Ha | 2017-09-17 | 3 | -5/+12 |
|\ | | | | | Fix linking error on OSX & fix websocket example | ||||
| * | Merge branch 'master' into fix_libssl_example | Jaeseung Ha | 2017-09-17 | 15 | -3324/+3572 |
| |\ | |/ |/| | |||||
* | | Merge pull request #193 from vadz/show-concurrency | Jaeseung Ha | 2017-09-17 | 1 | -1/+2 |
|\ \ | | | | | | | Show the number of threads used in the startup message | ||||
| * | | Show the number of threads used in the startup message | Vadim Zeitlin | 2016-11-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | This can be useful, especially when using the default hardware concurrency, to see how many threads does the server actually use in the logs. | ||||
* | | | Merge pull request #194 from vadz/atomic-conn-count | Jaeseung Ha | 2017-09-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use atomic type for connection count shared between threads | ||||
| * | | | Use atomic type for connection count shared between threads | Vadim Zeitlin | 2016-11-15 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | Even if this variable is only used in debug mode, it's still bad to have data races on it, as it was the case (and reported by thread sanitizer) before. | ||||
* | | | Merge pull request #183 from philave/vs2015-compilation-fix | Jaeseung Ha | 2017-09-17 | 2 | -2/+11 |
|\ \ \ | | | | | | | | | MS VS2015 compilation fix. | ||||
| * | | | MS VS2015 compilation fix. It’s better to use native Win32 (strncpy_s, ↵ | Philip | 2016-10-21 | 2 | -2/+11 |
| |/ / | | | | | | | | | | sprintf_s) to avoid compilation errors when building by MS C++. | ||||
* | | | Merge pull request #200 from sgiurgiu/master | Jaeseung Ha | 2017-09-17 | 2 | -4/+5 |
|\ \ \ | | | | | | | | | Removed strict-aliasing warning | ||||
| * \ \ | Merge branch 'master' into master | Jaeseung Ha | 2017-09-17 | 15 | -4219/+4447 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Update links in the conanfile.py | ipknHama | 2017-09-17 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #198 from javierjeronimo/master | Jaeseung Ha | 2017-09-17 | 3 | -2/+39 |
|\ \ \ \ | | | | | | | | | | | Add compatibility with conan.io | ||||
| * | | | | Make it compatible with conan.io (but optional). | Javier Jerónimo Suárez | 2016-11-22 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | ignore | Javier Jerónimo Suárez | 2016-11-20 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | fix | Javier Jerónimo Suárez | 2016-11-20 | 1 | -7/+0 |
| | | | | | |||||
| * | | | | indent | Javier Jerónimo Suárez | 2016-11-20 | 1 | -3/+2 |
| | | | | | |||||
| * | | | | indent | Javier Jerónimo Suárez | 2016-11-20 | 1 | -5/+8 |
| | | | | | |||||
| * | | | | Fixes | Javier Jerónimo Suárez | 2016-11-20 | 1 | -7/+4 |
| | | | | | |||||
| * | | | | Its a header only conan package | Javier Jerónimo Suárez | 2016-11-19 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Requirements | Javier Jerónimo Suárez | 2016-11-19 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | More | Javier Jerónimo Suárez | 2016-11-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | More | Javier Jerónimo Suárez | 2016-11-19 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | More | Javier Jerónimo Suárez | 2016-11-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | More | Javier Jerónimo Suárez | 2016-11-19 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | More | Javier Jerónimo Suárez | 2016-11-19 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | More | Javier Jerónimo Suárez | 2016-11-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | More... | Javier Jerónimo Suárez | 2016-11-19 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Trying to add support for conan.io | Javier Jerónimo Suárez | 2016-11-19 | 1 | -0/+23 |
| | | | | | |||||
| * | | | | Trying to add support for conan.io dependency system... | Javier Jerónimo Suárez | 2016-11-19 | 2 | -0/+11 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #92 from whoshuu/add-new-toolchains | Jaeseung Ha | 2017-09-17 | 1 | -0/+8 |
|\ \ \ \ | | | | | | | | | | | Add new toolchains | ||||
| * | | | | Add clang compiler to travis configuration | Huu Nguyen | 2015-09-28 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Add two new gcc compilers to travis configuration | Huu Nguyen | 2015-09-28 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge pull request #182 from ghost/master | Jaeseung Ha | 2017-09-17 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | typo README.md | ||||
| * | | | | | typo README.md | barcarolle | 2016-10-20 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Delete new connection with error while accepting (kwangsei, PR #205) | ipknHama | 2017-09-17 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge pull request #210 from zxmarcos/master | Jaeseung Ha | 2017-09-17 | 2 | -3/+25 |
|\ \ \ \ \ | | | | | | | | | | | | | Add onaccept handler to websocket rule | ||||
| * | | | | | Add onaccept handler to websocket rule | Marcos Medeiros | 2016-12-28 | 2 | -3/+25 |
| |/ / / / | |||||
* | | | | | Merge pull request #212 from uctakeoff/fix_warning_in_cpp11 | Jaeseung Ha | 2017-09-17 | 1 | -4/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed a problem that warning appeared in c ++ 11 | ||||
| * | | | | | Fixed a problem that warning appeared in c ++ 11 | ushiyake | 2017-01-09 | 1 | -4/+16 |
| |/ / / / | |||||
* | | | | | Change vector to unordered_map for get_dict | ipknHama | 2017-09-17 | 1 | -7/+5 |
| | | | | | |||||
* | | | | | Add missed header file. | ipknHama | 2017-09-17 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #202 from Rasie1/master | Jaeseung Ha | 2017-09-17 | 4 | -3297/+3420 |
|\ \ \ \ \ | | | | | | | | | | | | | Conflict with std namespace | ||||
| * | | | | | Update amalgamate | Rasie1 | 2017-03-16 | 1 | -3183/+3234 |
| | | | | | | |||||
| * | | | | | Add get_dict usage to example | Rasie1 | 2017-03-16 | 1 | -0/+9 |
| | | | | | | |||||
| * | | | | | Add get_dict method | Rasie1 | 2017-03-16 | 1 | -0/+60 |
| | | | | | | |||||
| * | | | | | Upgrade amalgamate | Vsevolod Kvachev | 2016-12-06 | 2 | -1497/+1500 |
| |/ / / / | |||||
* | | | | | Merge pull request #223 from vbalien/patch-1 | Jaeseung Ha | 2017-09-17 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix typo in .travis.yml | ||||
| * | | | | | Fix typo in .travis.yml | Jisu Kim | 2017-03-14 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Fix #245. Trying to keep serving after an exception in the handler. | ipknHama | 2017-09-17 | 1 | -5/+12 |
| | | | | | |||||
* | | | | | Merge pull request #229 from JaewooSeo/wvalue_vector | Jaeseung Ha | 2017-09-17 | 1 | -0/+17 |
|\ \ \ \ \ | | | | | | | | | | | | | wvalue (json) support vector<wvalue> |