Commit Graph

1243 Commits

Author SHA1 Message Date
Jaeseung Ha
194a9ef681 Merge pull request #148 from thedrow/patch-3
Run compilation and tests with 2 jobs
2017-09-17 23:29:56 +09:00
Jaeseung Ha
69ed5c0a8e Merge pull request #147 from thedrow/patch-2
Enable ccache if found for faster builds
2017-09-17 23:27:20 +09:00
Jaeseung Ha
a92c305acb Merge pull request #174 from taylorking/master
implement .keys()
2017-09-17 19:18:07 +09:00
Jaeseung Ha
d8c4a67176 Merge branch 'master' into master 2017-09-17 19:17:54 +09:00
ipknHama
414809c742 Change websocket example to use default templates directory 2017-09-17 19:11:06 +09:00
Jaeseung Ha
6df366ce1d Merge pull request #177 from tekn0ir/fix_libssl_example
Fix linking error on OSX & fix websocket example
2017-09-17 19:15:03 +09:00
Jaeseung Ha
4394142d3f Merge branch 'master' into fix_libssl_example 2017-09-17 19:14:40 +09:00
Jaeseung Ha
4786dac0a8 Merge pull request #193 from vadz/show-concurrency
Show the number of threads used in the startup message
2017-09-17 18:31:24 +09:00
Jaeseung Ha
112e86b906 Merge pull request #194 from vadz/atomic-conn-count
Use atomic type for connection count shared between threads
2017-09-17 18:30:24 +09:00
Jaeseung Ha
c32aae4b5f Merge pull request #183 from philave/vs2015-compilation-fix
MS VS2015 compilation fix.
2017-09-17 18:29:52 +09:00
Jaeseung Ha
a3b9c11112 Merge pull request #200 from sgiurgiu/master
Removed strict-aliasing warning
2017-09-17 18:03:14 +09:00
Jaeseung Ha
ef17b8cb9b Merge branch 'master' into master 2017-09-17 18:01:57 +09:00
ipknHama
c43c052112 Update links in the conanfile.py 2017-09-17 15:41:34 +09:00
Jaeseung Ha
c550c2bab0 Merge pull request #198 from javierjeronimo/master
Add compatibility with conan.io
2017-09-17 14:47:42 +09:00
Jaeseung Ha
05fdf17795 Merge pull request #92 from whoshuu/add-new-toolchains
Add new toolchains
2017-09-17 14:39:01 +09:00
Jaeseung Ha
728f160604 Merge pull request #182 from ghost/master
typo README.md
2017-09-17 14:34:56 +09:00
ipknHama
c071f64376 Delete new connection with error while accepting (kwangsei, PR #205) 2017-09-17 14:13:33 +09:00
Jaeseung Ha
f0cb83df88 Merge pull request #210 from zxmarcos/master
Add onaccept handler to websocket rule
2017-09-17 14:17:46 +09:00
Jaeseung Ha
cf67a40e4c Merge pull request #212 from uctakeoff/fix_warning_in_cpp11
Fixed a problem that warning appeared in c ++ 11
2017-09-17 14:10:07 +09:00
ipknHama
92bea9e949 Change vector to unordered_map for get_dict 2017-09-17 14:02:46 +09:00
ipknHama
f35089b2aa Add missed header file. 2017-09-17 13:47:05 +09:00
Jaeseung Ha
13fdc9390b Merge pull request #202 from Rasie1/master
Conflict with std namespace
2017-09-17 13:50:50 +09:00
Jaeseung Ha
16064ec9ba Merge pull request #223 from vbalien/patch-1
Fix typo in .travis.yml
2017-09-17 13:25:20 +09:00
ipknHama
69a17f066b Fix #245. Trying to keep serving after an exception in the handler. 2017-09-17 12:45:13 +09:00
Jaeseung Ha
2564c62778 Merge pull request #229 from JaewooSeo/wvalue_vector
wvalue (json) support vector<wvalue>
2017-09-17 12:40:05 +09:00
Jaeseung Ha
cb9090b7c1 Merge pull request #243 from jamiebullock/master
Add support for HTTP 422 status code
2017-09-16 13:20:55 +09:00
Jaeseung Ha
51d51bac9b Merge pull request #226 from jcoffin01/fix_url
Modified websocket example to automatically retrieve server's hostname.
2017-09-06 15:42:53 +09:00
Jamie Bullock
679fe4a8ac Add support for HTTP 422 status code
See: https://tools.ietf.org/html/rfc4918#section-11.2
2017-09-04 16:40:40 +01:00
Jamie Bullock
9a1e4aefdd Revert "Add support for HTTP 422 status code"
This reverts commit 6e4e66ad12.
2017-09-04 16:38:51 +01:00
Jamie Bullock
6e4e66ad12 Add support for HTTP 422 status code
See: https://tools.ietf.org/html/rfc4918#section-11.2
2017-09-04 16:08:02 +01:00
jaewoo.seo
777852c97d wvalue (json) support vector<wvalue> 2017-05-12 11:43:27 +09:00
Jerry Coffin
251f0cf0ed Modified websocket example to automatically retrieve server's hostname. 2017-04-11 22:31:36 -07:00
Rasie1
15d377907f Update amalgamate 2017-03-16 19:27:34 +03:00
Rasie1
633dc82b8f Add get_dict usage to example 2017-03-16 19:27:19 +03:00
Rasie1
01b21296bc Add get_dict method 2017-03-16 19:25:27 +03:00
Jisu Kim
74bf317af5 Fix typo in .travis.yml 2017-03-14 13:47:48 +09:00
ushiyake
bd2dd4a8e4 Fixed a problem that warning appeared in c ++ 11 2017-01-09 21:24:01 +09:00
Marcos Medeiros
bea1ba3797 Add onaccept handler to websocket rule 2016-12-28 11:06:56 -02:00
Vsevolod Kvachev
32d66d6fd1 Upgrade amalgamate 2016-12-06 18:22:10 +03:00
Sergiu Giurgiu
c63113f825 Removed strict-aliasing warning 2016-12-04 14:03:20 -05:00
Javier Jerónimo Suárez
c03d3b2d5a Make it compatible with conan.io (but optional). 2016-11-22 17:50:06 +01:00
Javier Jerónimo Suárez
a71c0a0edb ignore 2016-11-20 23:20:48 +01:00
Javier Jerónimo Suárez
91ac9111d4 fix 2016-11-20 23:04:25 +01:00
Javier Jerónimo Suárez
79ca284d6c indent 2016-11-20 22:47:14 +01:00
Javier Jerónimo Suárez
18bc428f06 indent 2016-11-20 22:43:34 +01:00
Javier Jerónimo Suárez
5f786cdccd Fixes 2016-11-20 22:40:47 +01:00
Javier Jerónimo Suárez
c2f3aea0a1 Its a header only conan package 2016-11-19 12:39:13 +01:00
Javier Jerónimo Suárez
2877991498 Requirements 2016-11-19 12:07:14 +01:00
Javier Jerónimo Suárez
e9c97b1350 More 2016-11-19 12:02:04 +01:00
Javier Jerónimo Suárez
d43cd76435 More 2016-11-19 12:00:26 +01:00