Commit Graph

396 Commits

Author SHA1 Message Date
Peter Thorson
f6fd0f4fb2 Merge pull request #93 from oberstet/master
Build fixes
2012-03-15 06:33:06 -07:00
Tobias Oberstein
09c541185d disable TLS build on Win .. needs OpenSSL dev .. 2012-03-15 14:27:25 +01:00
Tobias Oberstein
c6bb4912b2 fix scons build 2012-03-15 14:11:21 +01:00
Peter Thorson
3994731df8 Merge branch 'master' of github.com:zaphoyd/websocketpp 2012-03-15 07:37:31 -05:00
Peter Thorson
6b32481a87 make static library default 2012-03-15 07:36:29 -05:00
Peter Thorson
2fa84a07f0 Merge pull request #92 from blindmatrix/master
Removed extra comma in header (and more stuff)
2012-03-15 05:36:08 -07:00
Sven Almgren
1a0796d315 Removed duplicate variable in assignment (m_state = m_state = X) 2012-03-15 12:57:34 +01:00
Sven Almgren
002b8a2c35 Removed extra comma, as -pedantic complains 2012-03-15 11:56:34 +01:00
Peter Thorson
26462c17d8 new makefile bug fix for static builds 2012-03-14 07:33:11 -05:00
Peter Thorson
4bf1d63741 Merge pull request #89 from blindmatrix/policy-refactor
centralized makefiles for examples
2012-03-14 05:26:59 -07:00
Sven Almgren
36e76ac246 Merged upstream and resolved confilicts 2012-03-14 13:15:01 +01:00
Sven Almgren
f085cc63b6 Centralized makefiles for examples 2012-03-14 12:52:55 +01:00
Sven Almgren
844f34bb3a Removed binary from source tree 2012-03-14 12:51:06 +01:00
Peter Thorson
3f7664ab97 Merge pull request #87 from blindmatrix/policy-refactor
Policy refactor: Updates to makefiles
2012-03-14 04:50:29 -07:00
Peter Thorson
35691eca17 adds more scons targets 2012-03-14 06:39:18 -05:00
Sven Almgren
6d206c0e9f Hide generated shared SO files 2012-03-14 12:36:46 +01:00
Sven Almgren
5b9cab14ff Removed quotes from SHARED and BUILD_TYPE defaults 2012-03-14 12:33:51 +01:00
Sven Almgren
b985f5aa4b Fixed if-statement for running ldconfig on newer Ubuntu 2012-03-14 12:31:58 +01:00
Peter Thorson
046c2dea91 scons build supports echo_client, chat_server, chat_client 2012-03-14 06:28:10 -05:00
Peter Thorson
6471b95a40 Xcode project update 2012-03-14 06:27:34 -05:00
Peter Thorson
7fca59a99b fixes example server bugs and logging levels 2012-03-14 06:27:28 -05:00
Peter Thorson
576b6e43ad unix makefile updates 2012-03-14 06:27:10 -05:00
Peter Thorson
02dd3f8193 removes legacy files 2012-03-14 06:26:55 -05:00
Sven Almgren
f9d21d80b6 Make sure lib-directory exists before copying files on install 2012-03-14 12:09:04 +01:00
Sven Almgren
3d2078c372 Added new variable to specify base of boost library (BOOST_PREFIX) 2012-03-14 11:59:13 +01:00
Peter Thorson
a0eeb7fb71 removes legacy code 2012-03-14 05:54:22 -05:00
Peter Thorson
8e2c82e098 connection destructor fix 2012-03-12 10:48:18 -05:00
Peter Thorson
f32ddff367 concurrency review part 1 2012-03-12 10:03:54 -05:00
Peter Thorson
a3001a4c7c concurrency fixes 2012-03-11 20:42:22 -05:00
Peter Thorson
6380f56384 wsperf blocking mode 2012-03-11 17:02:14 -05:00
Peter Thorson
cfc491ffce fixes some concurrency bugs 2012-03-11 13:19:53 -05:00
Peter Thorson
a76e662192 reset request coordinator after connection failure 2012-03-11 12:44:38 -05:00
Peter Thorson
3c043a402f log level tweaks 2012-03-11 08:37:05 -05:00
Peter Thorson
294b416ec9 adds wsperf silent mode and client auto-reconnect 2012-03-11 08:26:34 -05:00
Peter Thorson
6e7589787b test_start message indicates which thread will run test 2012-03-11 08:05:14 -05:00
Peter Thorson
46c3a0b29d cleans up concurrent_handler adds num_workers to welcome 2012-03-11 07:55:20 -05:00
Peter Thorson
7c1f9d702e wsperf bug fixes 2012-03-10 18:39:57 -06:00
Peter Thorson
4903edbe30 wsperf won't set a timer when timeout=0 2012-03-10 16:19:37 -06:00
Peter Thorson
338ac2a574 updates wsperf to use library UA constant 2012-03-10 11:22:35 -06:00
Peter Thorson
d1b552691a adds websocketpp::USER_AGENT constant 2012-03-10 11:22:25 -06:00
Peter Thorson
cedfddd8ed updates wsperf.cfg with new options 2012-03-10 11:21:57 -06:00
Peter Thorson
c0fc773071 adds welcome message to wsperf, lots of wsperf cleanup 2012-03-10 11:06:59 -06:00
Peter Thorson
5e8ed9f64f adds welcome message to wsperf, lots of wsperf cleanup 2012-03-10 11:06:22 -06:00
Peter Thorson
7042091a61 adds client mode and program options to wsperf 2012-03-10 09:10:01 -06:00
Peter Thorson
0360e6669a Merge branch 'policy-refactor' of github.com:zaphoyd/websocketpp into policy-refactor 2012-03-09 08:40:00 -06:00
Peter Thorson
6fd7a091e0 update chat_client to new API 2012-03-09 08:34:52 -06:00
Peter Thorson
d21df34a87 fixes some client api issues 2012-03-09 08:32:40 -06:00
Peter Thorson
ead6f8853c Merge pull request #81 from oberstet/policy-refactor2
Various build things
2012-03-08 10:45:37 -08:00
Tobias Oberstein
16a4ba98b4 refactor build for tree of scons makefiles, fix out of source build, correct target handling 2012-03-08 17:55:13 +01:00
Tobias Oberstein
ae2dac32f0 make away warn 2012-03-08 17:15:37 +01:00