~pajlada/+git/websocketpp:pr/456

Last commit made on 2015-08-06
Get this branch:
git clone -b pr/456 https://git.launchpad.net/~pajlada/+git/websocketpp

Branch merges

Branch information

Name:
pr/456
Repository:
lp:~pajlada/+git/websocketpp

Recent commits

0b2b77e... by Peter Thorson <email address hidden>

update changelog

15c78af... by Eli Fidler <email address hidden>

fix crash in strip_lws()

Before this fix, a malicious client could cause a websocketpp server to create an invalid std::string.

4b18214... by Peter Thorson <email address hidden>

Add preliminary support for C++11 features in Visual Studio 2015

e806732... by Peter Thorson <email address hidden>

Merge branch 'pr/454' into develop

95551e7... by Peter Thorson <email address hidden>

code style & change log update for PR

22918a3... by Peter Thorson <email address hidden>

Merge branch 'permessage-deflate' into develop

Conflicts:
 Doxyfile
 examples/utility_client/CMakeLists.txt
 websocketpp/version.hpp

9b09b0b... by Peter Thorson <email address hidden>

Merge branch 'pr/449' into develop

ef380f7... by Peter Thorson <email address hidden>

Add CMake build support for examples and tests, zlib dependencies

1f50400... by Mark Grimes <email address hidden>

Use smart pointer to hold new io_service temporarily in case of errors

c54f2ab... by Peter Thorson <email address hidden>

utility client build scripts