Commit Graph

1271 Commits

Author SHA1 Message Date
Peter Thorson
fd0c62a8e4 add TLS config and types to asio integration tests 2014-03-05 07:27:41 -06:00
Peter Thorson
1a68f4b907 Merge pull request #335 from aydany/master
Require a valid con before calling terminate
2014-03-05 07:23:19 -06:00
Aydan Yumerefendi
c3dfb25181 Merge remote-tracking branch 'upstream/master'
Conflicts:
	websocketpp/roles/server_endpoint.hpp
2014-03-04 21:19:24 -05:00
Aydan Yumerefendi
5a5d8321bd Require a valid con before calling terminate
If get_connection returns null, e.g., if during stop the tls_init
handler is removed from the server, con->terminate will cause a crash.
2014-03-04 21:02:42 -05:00
Peter Thorson
b805689f9c whitespace and don't accept if we know the transport isn't listening references #334 2014-03-04 06:45:00 -06:00
Peter Thorson
7eedf25500 Merge pull request #334 from aydany/master
Avoid leak when stopping server
2014-03-04 06:18:34 -06:00
Aydan Yumerefendi
3ca53d0064 Avoid leak when stopping server
If accept fails, e.g., because the server is no longer listening the
connection object is not terminated and it results in a memory leak:
connection -> handler -> connection.
2014-03-03 21:51:56 -05:00
Peter Thorson
5e2fadd826 pass better information about TLS handshake failures 2014-03-03 17:09:55 -06:00
Peter Thorson
840bb6b59e code style and whitespace 2014-03-03 10:32:04 -06:00
Peter Thorson
fe00a84f7b Merge pull request #333 from aydany/master
Fix memory leak when init_asio fails
2014-03-03 10:24:11 -06:00
Aydan Yumerefendi
337bf2fb0a Fix memory leak on create
If the socket fails to initialize, e.g., by omitting the tis init
handler, the connection is leaked, since there is a circular reference
between the connection and its async_read/async_write handlers. To fix
this, check the error code, and reset the handler is an error has
occurred.
2014-03-03 11:08:24 -05:00
Peter Thorson
c5b5492e5c fix memory leak when a connection fails references #323 2014-03-02 22:12:38 -06:00
Peter Thorson
af15537205 add debug header to integration tests 2014-03-02 22:12:14 -06:00
Peter Thorson
bdeb4ad680 code style and documentation 2014-03-02 21:39:34 -06:00
Peter Thorson
faad2ec854 add copyright info to debug client 2014-03-02 19:43:25 -06:00
Peter Thorson
dc06049df9 add debug server example 2014-03-02 19:43:11 -06:00
Peter Thorson
3e53c74c3f Merge pull request #332 from zaphoyd/tutorials
Update examples and tutorials
2014-03-02 19:27:56 -06:00
Peter Thorson
a5a30e554e rename app_client to utility_client and set utility_client to be the final step of the utility_client tutorial 2014-03-02 19:21:17 -06:00
Peter Thorson
9c8762c961 rename old utility client to debug client 2014-03-02 19:20:42 -06:00
Peter Thorson
797ce35c5a more renaming and adding license notes 2014-03-02 19:14:59 -06:00
Peter Thorson
30da3a967b renaming and re-titling the app client tutorial to utility client 2014-03-02 19:10:24 -06:00
Peter Thorson
e1547bbde8 stray characters 2014-03-02 19:04:13 -06:00
Peter Thorson
37f69cc19b fix typo 2014-03-02 19:03:04 -06:00
Peter Thorson
93d9b5f820 Formatting fixes for app client tutorial step 5 2014-03-02 19:02:11 -06:00
Peter Thorson
98fd183210 Finish app client tutorial step 5 (closing) 2014-03-02 18:53:55 -06:00
Peter Thorson
093806f860 Merge branch 'master' into tutorials 2014-03-02 12:21:32 -06:00
Peter Thorson
1da45144e9 whitespace 2014-03-02 12:21:04 -06:00
Peter Thorson
5f56976290 Add method to look up a human readable string given a close code value 2014-03-02 12:19:50 -06:00
Peter Thorson
40ed74a141 Use clang on OS X by default for building examples and tests 2014-03-02 12:17:03 -06:00
Peter Thorson
fbc9db2b5d work on close step 2014-03-02 12:06:37 -06:00
Peter Thorson
f87c9d4360 need the line breaks to work here 2014-03-02 08:33:41 -06:00
Peter Thorson
99461184d3 Merge pull request #331 from zaphoyd/tls_short_read
Tls short read related changes references #263
2014-02-28 09:04:59 -06:00
Peter Thorson
9eff0db756 update changelog 2014-02-28 09:05:53 -06:00
Peter Thorson
86325b1838 cleans up the handling of TLS related transport errors
Specifically: TLS short read is separated from other TLS errors. Other
TLS errors are also not separated from generic “pass through” errors.

TLS short read is now considered “expected” during socket shutdown and
is not reported as an error.
2014-02-28 09:02:26 -06:00
Peter Thorson
2d2312a1d7 add socket/security policies to translate asio -> websocketpp error codes
The reason these were added to the socket policies rather than higher
up is that in some cases translating error codes requires information
from headers and libraries that are not present except when certain
socket policies are being used. For example, SSL/TLS related errors can
only be translated using openssl, which is only pulled in with the TLS
socket policy.
2014-02-28 09:00:45 -06:00
Peter Thorson
afc28be004 whitespace 2014-02-28 08:27:29 -06:00
Peter Thorson
b7c5a2e791 tls short read in state closed is no longer an error 2014-02-28 08:27:14 -06:00
Peter Thorson
d36925ce7d Add new generic TLS error code 2014-02-28 08:26:50 -06:00
Peter Thorson
92dfe9ef97 clarify commands section and new members/methods of websocket_endpoint 2014-02-23 15:46:51 -06:00
Peter Thorson
2ab02197fd Fleshes out step 4 (opening connections) 2014-02-23 15:31:54 -06:00
Peter Thorson
89ac45e60a additional work on app client tutorial 2014-02-23 09:34:34 -06:00
Peter Thorson
713a05679c Merge pull request #325 from zaphoyd/max-message-size
error handling changes that ended up on wrong branch
2014-02-18 07:59:20 -06:00
Peter Thorson
0fecf023ef refactor connection error handling code 2014-02-18 08:01:16 -06:00
Peter Thorson
ffdf5f842b reclassify action after shutdown as info rather than fatal references #62 2014-02-18 07:59:43 -06:00
Peter Thorson
d425caea80 Fix misclassified error log entry 2014-02-18 07:58:49 -06:00
Peter Thorson
ce2c1d6e34 whitespace 2014-02-13 11:18:44 -06:00
Peter Thorson
7ceeaa4f9c fix documentation spelling error 2014-02-13 11:10:47 -06:00
Peter Thorson
883410bb77 Fix an issue where custom timeout values weren't being propagated from endpoints to new connections 2014-02-12 15:07:09 -06:00
Peter Thorson
724974c758 Merge pull request #322 from zaphoyd/max-message-size
Adds the ability to specify a max message size
2014-02-10 20:55:02 -06:00
Peter Thorson
1622cdde04 Retry the travis build 2014-02-10 20:51:37 -06:00