aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #174 from taylorking/masterJaeseung Ha2017-09-172-46/+18
|\ | | | | implement .keys()
| * Merge branch 'master' into masterJaeseung Ha2017-09-1716-3386/+3578
| |\ | |/ |/|
* | Change websocket example to use default templates directoryipknHama2017-09-171-1/+1
| |
* | Merge pull request #177 from tekn0ir/fix_libssl_exampleJaeseung Ha2017-09-173-5/+12
|\ \ | | | | | | Fix linking error on OSX & fix websocket example
| * \ Merge branch 'master' into fix_libssl_exampleJaeseung Ha2017-09-1715-3324/+3572
| |\ \ | |/ / |/| |
* | | Merge pull request #193 from vadz/show-concurrencyJaeseung Ha2017-09-171-1/+2
|\ \ \ | | | | | | | | Show the number of threads used in the startup message
| * | | Show the number of threads used in the startup messageVadim Zeitlin2016-11-151-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-countJaeseung Ha2017-09-171-1/+1
|\ \ \ \ | | | | | | | | | | Use atomic type for connection count shared between threads
| * | | | Use atomic type for connection count shared between threadsVadim Zeitlin2016-11-151-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-fixJaeseung Ha2017-09-172-2/+11
|\ \ \ \ | | | | | | | | | | MS VS2015 compilation fix.
| * | | | MS VS2015 compilation fix. It’s better to use native Win32 (strncpy_s, ↵Philip2016-10-212-2/+11
| |/ / / | | | | | | | | | | | | sprintf_s) to avoid compilation errors when building by MS C++.
* | | | Merge pull request #200 from sgiurgiu/masterJaeseung Ha2017-09-172-4/+5
|\ \ \ \ | | | | | | | | | | Removed strict-aliasing warning
| * \ \ \ Merge branch 'master' into masterJaeseung Ha2017-09-1715-4219/+4447
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Update links in the conanfile.pyipknHama2017-09-171-3/+3
| | | | |
* | | | | Merge pull request #198 from javierjeronimo/masterJaeseung Ha2017-09-173-2/+39
|\ \ \ \ \ | | | | | | | | | | | | Add compatibility with conan.io
| * | | | | Make it compatible with conan.io (but optional).Javier Jerónimo Suárez2016-11-221-2/+4
| | | | | |
| * | | | | ignoreJavier Jerónimo Suárez2016-11-201-0/+3
| | | | | |
| * | | | | fixJavier Jerónimo Suárez2016-11-201-7/+0
| | | | | |
| * | | | | indentJavier Jerónimo Suárez2016-11-201-3/+2
| | | | | |
| * | | | | indentJavier Jerónimo Suárez2016-11-201-5/+8
| | | | | |
| * | | | | FixesJavier Jerónimo Suárez2016-11-201-7/+4
| | | | | |
| * | | | | Its a header only conan packageJavier Jerónimo Suárez2016-11-191-1/+0
| | | | | |
| * | | | | RequirementsJavier Jerónimo Suárez2016-11-191-0/+3
| | | | | |
| * | | | | MoreJavier Jerónimo Suárez2016-11-191-1/+1
| | | | | |
| * | | | | MoreJavier Jerónimo Suárez2016-11-191-0/+1
| | | | | |
| * | | | | MoreJavier Jerónimo Suárez2016-11-191-1/+1
| | | | | |
| * | | | | MoreJavier Jerónimo Suárez2016-11-191-3/+1
| | | | | |
| * | | | | MoreJavier Jerónimo Suárez2016-11-191-0/+2
| | | | | |
| * | | | | MoreJavier Jerónimo Suárez2016-11-191-1/+1
| | | | | |
| * | | | | More...Javier Jerónimo Suárez2016-11-191-0/+3
| | | | | |
| * | | | | Trying to add support for conan.ioJavier Jerónimo Suárez2016-11-191-0/+23
| | | | | |
| * | | | | Trying to add support for conan.io dependency system...Javier Jerónimo Suárez2016-11-192-0/+11
| | |/ / / | |/| | |
* | | | | Merge pull request #92 from whoshuu/add-new-toolchainsJaeseung Ha2017-09-171-0/+8
|\ \ \ \ \ | | | | | | | | | | | | Add new toolchains
| * | | | | Add clang compiler to travis configurationHuu Nguyen2015-09-281-0/+4
| | | | | |
| * | | | | Add two new gcc compilers to travis configurationHuu Nguyen2015-09-281-0/+4
| | | | | |
* | | | | | Merge pull request #182 from ghost/masterJaeseung Ha2017-09-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | typo README.md
| * | | | | | typo README.mdbarcarolle2016-10-201-1/+1
| | |/ / / / | |/| | | |
* | | | | | Delete new connection with error while accepting (kwangsei, PR #205)ipknHama2017-09-171-0/+4
| | | | | |
* | | | | | Merge pull request #210 from zxmarcos/masterJaeseung Ha2017-09-172-3/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add onaccept handler to websocket rule
| * | | | | | Add onaccept handler to websocket ruleMarcos Medeiros2016-12-282-3/+25
| |/ / / / /
* | | | | | Merge pull request #212 from uctakeoff/fix_warning_in_cpp11Jaeseung Ha2017-09-171-4/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed a problem that warning appeared in c ++ 11
| * | | | | | Fixed a problem that warning appeared in c ++ 11ushiyake2017-01-091-4/+16
| |/ / / / /
* | | | | | Change vector to unordered_map for get_dictipknHama2017-09-171-7/+5
| | | | | |
* | | | | | Add missed header file.ipknHama2017-09-171-0/+1
| | | | | |
* | | | | | Merge pull request #202 from Rasie1/masterJaeseung Ha2017-09-174-3297/+3420
|\ \ \ \ \ \ | | | | | | | | | | | | | | Conflict with std namespace
| * | | | | | Update amalgamateRasie12017-03-161-3183/+3234
| | | | | | |
| * | | | | | Add get_dict usage to exampleRasie12017-03-161-0/+9
| | | | | | |
| * | | | | | Add get_dict methodRasie12017-03-161-0/+60
| | | | | | |
| * | | | | | Upgrade amalgamateVsevolod Kvachev2016-12-062-1497/+1500
| |/ / / / /
* | | | | | Merge pull request #223 from vbalien/patch-1Jaeseung Ha2017-09-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typo in .travis.yml