Peter Thorson 371d2cdaef Merge branch 'master' into permessage-deflate ...

Conflicts:
	websocketpp/version.hpp

2015-02-27 09:55:51 -05:00

..

connection

update changelog, remove unused parameters

2014-12-16 07:05:47 -05:00

endpoint

Endpoints are now reset after listen failure. fixes #390

2015-01-22 08:20:13 -05:00

extension

update interface and unit tests for new permessage-deflate parameter names

2014-03-26 07:19:35 -05:00

http

Fixes an issue where some frame data was counted against the max header size limit

2015-02-27 09:48:00 -05:00

logger

normalize copyright dates and prep release version

2014-11-04 07:31:24 -05:00

message_buffer

normalize copyright dates and prep release version

2014-11-04 07:31:24 -05:00

processors

Merge branch 'master' into permessage-deflate

2015-01-20 06:51:06 -05:00

random

normalize copyright dates and prep release version

2014-11-04 07:31:24 -05:00

roles

normalize copyright dates and prep release version

2014-11-04 07:31:24 -05:00

transport

increase test timeouts

2015-01-20 07:55:42 -05:00

utility

Fixes out of scope pointer returned from websocketpp::exception::what(); fixes #397

2015-01-22 07:33:14 -05:00