add debug printing of basic headers

allows the processor to log directly to the connection’s log

.gitattributes

@@ -1,7 +1,7 @@
 # Lineendings
 *.sln       eol=crlf
 *.vcproj    eol=crlf
-*.vcxproj*  eol=crfl
+*.vcxproj*  eol=crlf
 
 # Whitespace rules
 # strict (no trailing, no tabs)
@@ -15,4 +15,4 @@
 *.txt       whitespace=trailing-space,space-before-tab,cr-at-eol
 
 # special files which must ignore whitespace
-*.patch     whitespace=-trailing-space
+*.patch     whitespace=-trailing-space

.travis.yml

@@ -10,6 +10,8 @@ env:
 script: scons -j 2 && scons test
 branches:
   only:
+    - master
+    - permessage-deflate
     - experimental
     - 0.3.x-cmake
 notifications:
@@ -17,4 +19,4 @@ notifications:
     - travis@zaphoyd.com
   email:
     on_success: change
-    on_failure: always
+    on_failure: always

CMakeLists.txt

@@ -9,8 +9,8 @@ project (websocketpp)
 cmake_minimum_required (VERSION 2.6)
 
 set (WEBSOCKETPP_MAJOR_VERSION 0)
-set (WEBSOCKETPP_MINOR_VERSION 2)
-set (WEBSOCKETPP_PATCH_VERSION 99)
+set (WEBSOCKETPP_MINOR_VERSION 3)
+set (WEBSOCKETPP_PATCH_VERSION 0)
 set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
 
 set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
@@ -92,7 +92,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
 
     # Visual studio
     if (MSVC)
-        set (WEBSOCKETPP_BOOST_LIBS system thread regex)
+        set (WEBSOCKETPP_BOOST_LIBS system thread)
         set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /Gy /GF /Ox /Ob2 /Ot /Oi /MP /arch:SSE2 /fp:fast")
         set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG /INCREMENTAL:NO /OPT:REF /OPT:ICF")
         add_definitions (/W3 /wd4996 /wd4995 /wd4355)
@@ -105,7 +105,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
     if (CMAKE_COMPILER_IS_GNUCXX)
         set (WEBSOCKETPP_PLATFORM_LIBS pthread rt)
         set (WEBSOCKETPP_PLATFORM_TSL_LIBS ssl crypto)
-        set (WEBSOCKETPP_BOOST_LIBS system thread regex)
+        set (WEBSOCKETPP_BOOST_LIBS system thread)
         set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x")
         if (NOT APPLE)
             add_definitions (-DNDEBUG -Wall -Wcast-align) # todo: should we use CMAKE_C_FLAGS for these?
@@ -115,8 +115,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
         execute_process (COMMAND ${CMAKE_CXX_COMPILER} "-dumpversion" OUTPUT_VARIABLE GCC_VERSION)
         if ("${GCC_VERSION}" STRGREATER "4.4.0")
             message("* C++11 support partially enabled due to GCC version ${GCC_VERSION}")
-            set (WEBSOCKETPP_BOOST_LIBS system thread regex)
-            add_definitions (-D_WEBSOCKETPP_NO_CPP11_REGEX_)
+            set (WEBSOCKETPP_BOOST_LIBS system thread)
         endif ()
     endif ()
 
@@ -128,7 +127,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
             set (WEBSOCKETPP_PLATFORM_LIBS pthread)
         endif()
         set (WEBSOCKETPP_PLATFORM_TSL_LIBS ssl crypto)
-        set (WEBSOCKETPP_BOOST_LIBS system thread regex)
+        set (WEBSOCKETPP_BOOST_LIBS system thread)
         set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here?
         if (NOT APPLE)
             add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these?
@@ -205,6 +204,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
         message (FATAL_ERROR "Failed to find required dependency: boost")
     endif ()
 
+    find_package(OpenSSL)
 endif()
 
 ############ Add projects

COPYING

@@ -1,3 +1,5 @@
+Main Library:
+
 Copyright (c) 2013, Peter Thorson. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -11,13 +13,133 @@ modification, are permitted provided that the following conditions are met:
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Bundled Libraries:
+
+****** Base 64 Library (base64/base64.hpp) ******
+base64.hpp is a repackaging of the base64.cpp and base64.h files into a
+single header suitable for use as a header only library. This conversion was
+done by Peter Thorson (webmaster@zaphoyd.com) in 2012. All modifications to
+the code are redistributed under the same license as the original, which is
+listed below.
+
+base64.cpp and base64.h
+
+Copyright (C) 2004-2008 René Nyffenegger
+
+This source code is provided 'as-is', without any express or implied
+warranty. In no event will the author be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this source code must not be misrepresented; you must not
+  claim that you wrote the original source code. If you use this source code
+  in a product, an acknowledgment in the product documentation would be
+  appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+  misrepresented as being the original source code.
+
+3. This notice may not be removed or altered from any source distribution.
+
+René Nyffenegger rene.nyffenegger@adp-gmbh.ch
+
+****** SHA1 Library (sha1/sha1.hpp) ******
+sha1.hpp is a repackaging of the sha1.cpp and sha1.h files from the shallsha1
+library (http://code.google.com/p/smallsha1/) into a single header suitable for
+use as a header only library. This conversion was done by Peter Thorson
+(webmaster@zaphoyd.com) in 2013. All modifications to the code are redistributed
+under the same license as the original, which is listed below.
+
+ Copyright (c) 2011, Micael Hildenborg
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Micael Hildenborg nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY Micael Hildenborg ''AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL Micael Hildenborg BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+****** MD5 Library (common/md5.hpp) ******
+md5.hpp is a reformulation of the md5.h and md5.c code from
+http://www.opensource.apple.com/source/cups/cups-59/cups/md5.c to allow it to
+function as a component of a header only library. This conversion was done by
+Peter Thorson (webmaster@zaphoyd.com) in 2012 for the WebSocket++ project. The
+changes are released under the same license as the original (listed below)
+
+Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+L. Peter Deutsch
+ghost@aladdin.com
+
+****** UTF8 Validation logic (utf8_validation.hpp) ******
+utf8_validation.hpp is adapted from code originally written by Bjoern Hoehrmann
+<bjoern@hoehrmann.de>. See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for
+details.
+
+The original license:
+
+Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Doxyfile

@@ -33,7 +33,7 @@ PROJECT_NAME           = "websocketpp"
 # if some version control system is used.
 
 
-PROJECT_NUMBER         = "0.3.0-dev"
+PROJECT_NUMBER         = "0.3.0-alpha4"
 
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
@@ -670,7 +670,10 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = websocketpp
+INPUT                  = websocketpp \
+                         readme.md \
+                         changelog.md \
+                         roadmap.md
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

SConstruct

@@ -79,6 +79,8 @@ elif env['PLATFORM'] == 'posix':
    env.Append(CCFLAGS = ['-Wall'])
    #env['LINKFLAGS'] = ''
 elif env['PLATFORM'] == 'darwin':
+   if not os.environ.has_key('CXX'):
+      env['CXX'] = "clang++"
    if env.has_key('DEBUG'):
       env.Append(CCFLAGS = ['-g', '-O0'])
    else:
@@ -98,11 +100,13 @@ else:
 if env['CXX'].startswith('g++'):
    #env.Append(CCFLAGS = ['-Wconversion'])
    env.Append(CCFLAGS = ['-Wcast-align'])
+   env.Append(CCFLAGS = ['-Wshadow'])
 elif env['CXX'].startswith('clang++'):
    #env.Append(CCFLAGS = ['-Wcast-align'])
    #env.Append(CCFLAGS = ['-Wglobal-constructors'])
    #env.Append(CCFLAGS = ['-Wconversion'])
    env.Append(CCFLAGS = ['-Wno-padded'])
+   env.Append(CCFLAGS = ['-Wshadow'])
 
    # Wpadded
    # Wsign-conversion
@@ -133,21 +137,16 @@ env_cpp11 = env.Clone ()
 
 if env_cpp11['CXX'].startswith('g++'):
    # TODO: check g++ version
-
-   # g++ STL lacks support for <regex>
-
    GCC_VERSION = commands.getoutput(env_cpp11['CXX'] + ' -dumpversion')
 
    if GCC_VERSION > "4.4.0":
       print "C++11 build environment partially enabled"
-      env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x'],TOOLSET = ['g++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_','_WEBSOCKETPP_NO_CPP11_REGEX_'])
-      # libstdc++ does not yet support <regex>
-      # boost regex is a drop in replacement
-      polyfill_libs += boostlibs(['regex'],env_cpp11)
+      env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x'],TOOLSET = ['g++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_'])
    else:
       print "C++11 build environment is not supported on this version of G++"
 elif env_cpp11['CXX'].startswith('clang++'):
    print "C++11 build environment enabled"
+   env.Append(CXXFLANGS = ['-stdlib=libc++'],LINKFLAGS=['-stdlib=libc++'])
    env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x','-stdlib=libc++'],LINKFLAGS = ['-stdlib=libc++'],TOOLSET = ['clang++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_'])
 
    # look for optional second boostroot compiled with clang's libc++ STL library
@@ -163,7 +162,7 @@ else:
    print "C++11 build environment disabled"
 
 # if the build system is known to allow the isystem modifier for library include
-# values then use it for the boost libraries. Otherwise just add them to the 
+# values then use it for the boost libraries. Otherwise just add them to the
 # regular CPPPATH values.
 if env['CXX'].startswith('g++') or env['CXX'].startswith('clang'):
 	env.Append(CPPFLAGS = '-isystem ' + env['BOOST_INCLUDES'])
@@ -172,7 +171,7 @@ else:
 env.Append(LIBPATH = [env['BOOST_LIBS']])
 
 # if the build system is known to allow the isystem modifier for library include
-# values then use it for the boost libraries. Otherwise just add them to the 
+# values then use it for the boost libraries. Otherwise just add them to the
 # regular CPPPATH values.
 if env_cpp11['CXX'].startswith('g++') or env_cpp11['CXX'].startswith('clang'):
 	env_cpp11.Append(CPPFLAGS = '-isystem ' + env_cpp11['BOOST_INCLUDES'])
@@ -209,25 +208,31 @@ if not env['PLATFORM'].startswith('win'):
 # Main test application
 #main = SConscript('#/examples/dev/SConscript',variant_dir = builddir + 'dev',duplicate = 0)
 
-# testee_server
-testee_server = SConscript('#/examples/testee_server/SConscript',variant_dir = builddir + 'testee_server',duplicate = 0)
-
 # echo_server
 echo_server = SConscript('#/examples/echo_server/SConscript',variant_dir = builddir + 'echo_server',duplicate = 0)
 
 # echo_server_tls
-if not env['PLATFORM'].startswith('win'):
+if tls_build:
     echo_server_tls = SConscript('#/examples/echo_server_tls/SConscript',variant_dir = builddir + 'echo_server_tls',duplicate = 0)
 
 # broadcast_server
 broadcast_server = SConscript('#/examples/broadcast_server/SConscript',variant_dir = builddir + 'broadcast_server',duplicate = 0)
 
-# echo_client
-echo_client = SConscript('#/examples/echo_client/SConscript',variant_dir = builddir + 'echo_client',duplicate = 0)
+# testee_server
+testee_server = SConscript('#/examples/testee_server/SConscript',variant_dir = builddir + 'testee_server',duplicate = 0)
+
+# testee_client
+testee_client = SConscript('#/examples/testee_client/SConscript',variant_dir = builddir + 'testee_client',duplicate = 0)
 
 # utility_client
 utility_client = SConscript('#/examples/utility_client/SConscript',variant_dir = builddir + 'utility_client',duplicate = 0)
 
+# debug_client
+debug_client = SConscript('#/examples/debug_client/SConscript',variant_dir = builddir + 'debug_client',duplicate = 0)
+
+# debug_server
+debug_server = SConscript('#/examples/debug_server/SConscript',variant_dir = builddir + 'debug_server',duplicate = 0)
+
 # subprotocol_server
 subprotocol_server = SConscript('#/examples/subprotocol_server/SConscript',variant_dir = builddir + 'subprotocol_server',duplicate = 0)
 
@@ -240,33 +245,3 @@ if not env['PLATFORM'].startswith('win'):
 
     # print_server
     print_server = SConscript('#/examples/print_server/SConscript',variant_dir = builddir + 'print_server',duplicate = 0)
-
-#
-#wsperf = SConscript('#/examples/wsperf/SConscript',
-#                    variant_dir = builddir + 'wsperf',
-#                    duplicate = 0)
-
-#echo_server = SConscript('#/examples/echo_server/SConscript',
-#                         variant_dir = builddir + 'echo_server',
-#                         duplicate = 0)
-
-#if tls_build:
-#   echo_server_tls = SConscript('#/examples/echo_server_tls/SConscript',
-#                            variant_dir = builddir + 'echo_server_tls',
-#                            duplicate = 0)
-
-#echo_client = SConscript('#/examples/echo_client/SConscript',
-#                         variant_dir = builddir + 'echo_client',
-#                         duplicate = 0)
-
-#chat_client = SConscript('#/examples/chat_client/SConscript',
-#                         variant_dir = builddir + 'chat_client',
-#                         duplicate = 0)
-
-#chat_server = SConscript('#/examples/chat_server/SConscript',
-#                         variant_dir = builddir + 'chat_server',
-#                         duplicate = 0)
-
-#concurrent_server = SConscript('#/examples/concurrent_server/SConscript',
-#                         variant_dir = builddir + 'concurrent_server',
-#                         duplicate = 0)

changelog.md

@@ -1,2 +1,135 @@
-0.3.0b1 - 2013-05-??
-- Initial Release
+HEAD
+- Feature: Adds `start_perpetual` and `stop_perpetual` methods to asio transport
+  These may be used to replace manually managed `asio::io_service::work` objects
+- Feature: Allow setting pong and handshake timeouts at runtime.
+- Feature: Allows changing the listen backlog queue length.
+- Feature: Split tcp init into pre and post init.
+- Feature: Adds URI method to extract query string from URI. Thank you Banaan
+  for code. #298
+- Feature: Adds a compile time switch to asio transport config to disable
+  certain multithreading features (some locks, asio strands)
+- Feature: Adds the ability to pause reading on a connection. Paused connections
+  will not read more data from their socket, allowing TCP flow control to work
+  without blocking the main thread.
+- Feature: Adds the ability to specify whether or not to use the `SO_REUSEADDR`
+  TCP socket option. The default for this value has been changed from `true` to
+  `false`.
+- Feature: Adds the ability to specify a maximum message size.
+- Feature: Adds `close::status::get_string(...)` method to look up a human
+  readable string given a close code value.
+- Improvement: Open, close, and pong timeouts can be disabled entirely by
+  setting their duration to 0.
+- Improvement: Numerous performance improvements. Including: tuned default
+  buffer sizes based on profiling, caching of handler binding for async
+  reads/writes, non-malloc allocators for read/write handlers, disabling of a
+  number of questionably useful range sanity checks in tight inner loops.
+- Improvement: Cleaned up the handling of TLS related errors. TLS errors will
+  now be reported with more detail on the info channel rather than all being
+  `tls_short_read` or `pass_through`. In addition, many cases where a TLS short
+  read was in fact expected are no longer classified as errors. Expected TLS
+  short reads and quasi-expected socket shutdown related errors will no longer
+  be reported as unclean WebSocket shutdowns to the application. Information
+  about them will remain in the info error channel for debugging purposes.
+- Improvement: `start_accept` and `listen` errors are now reported to the caller
+  either via an exception or an ec parameter.
+- Improvement: Outgoing writes are now batched for improved message throughput
+  and reduced system call and TCP frame overhead.
+- Bug: Fix some cases of calls to empty lib::function objects.
+- Bug: Fix memory leak of connection objects due to cached handlers holding on to
+  reference counted pointers. #310 Thank you otaras for reporting.
+- Bug: Fix issue with const endpoint accessors (such as `get_user_agent`) not
+  compiling due to non-const mutex use. #292 Thank you logofive for reporting.
+- Bug: Fix handler allocation crash with multithreaded `io_service`.
+- Bug: Fixes incorrect whitespace handling in header parsing. #301 Thank you
+  Wolfram Schroers for reporting
+- Bug: Fix a crash when parsing empty HTTP headers. Thank you Thingol for
+  reporting.
+- Bug: Fix a crash following use of the `stop_listening` function. Thank you
+  Thingol for reporting.
+- Bug: Fix use of variable names that shadow function parameters. The library
+  should compile cleanly with -Wshadow now. Thank you giszo for reporting. #318
+- Bug: Fix an issue where `set_open_handshake_timeout` was ignored by server
+  code. Thank you Robin Rowe for reporting.
+- Bug: Fix an issue where custom timeout values weren't being propagated from
+  endpoints to new connections.
+- Bug: Fix a number of memory leaks related to server connection failures. #323
+  #333 #334 #335 Thank you droppy and aydany for reporting and patches.
+  reporting.
+- Compatibility: Fix compile time conflict with Visual Studio's MIN/MAX macros.
+  Thank you Robin Rowe for reporting.
+- Documentation: Examples and test suite build system now defaults to clang on
+  OS X
+
+0.3.0-alpha4 - 2013-10-11
+- HTTP requests ending normally are no longer logged as errors. Thank you Banaan
+  for reporting. #294
+- Eliminates spurious expired timers in certain error conditions. Thank you
+  Banaan for reporting. #295
+- Consolidates all bundled library licenses into the COPYING file. #294
+- Updates bundled sha1 library to one with a cleaner interface and more
+  straight-forward license. Thank you lotodore for reporting and Evgeni Golov
+  for reviewing. #294
+- Re-introduces strands to asio transport, allowing `io_service` thread pools to
+  be used (with some limitations).
+- Removes endpoint code that kept track of a connection list that was never used
+  anywhere. Removes a lock and reduces connection creation/deletion complexity
+  from O(log n) to O(1) in the number of connections.
+- A number of internal changes to transport APIs
+- Deprecates iostream transport `readsome` in favor of `read_some` which is more
+  consistent with the naming of the rest of the library.
+- Adds preliminary signaling to iostream transport of eof and fatal transport
+  errors
+- Updates transport code to use shared pointers rather than raw pointers to
+  prevent asio from retaining pointers to connection methods after the
+  connection goes out of scope. #293 Thank you otaras for reporting.
+- Fixes an issue where custom headers couldn't be set for client connections
+  Thank you Jerry Win and Wolfram Schroers for reporting.
+- Fixes a compile error on visual studio when using interrupts. Thank you Javier
+  Rey Neira for reporting this.
+- Adds new 1012 and 1013 close codes per IANA registry
+- Add `set_remote_endpoint` method to iostream transport.
+- Add `set_secure` method to iostream transport.
+- Fix typo in .gitattributes file. Thank you jstarasov for reporting this. #280
+- Add missing locale include. Thank you Toninoso for reporting this. #281
+- Refactors `asio_transport` endpoint and adds full documentation and exception
+  free varients of all methods.
+- Removes `asio_transport` endpoint method cancel(). Use `stop_listen()` instead
+- Wrap internal `io_service` `run_one()` method
+- Suppress error when trying to shut down a connection that was already closed
+
+0.3.0-alpha3 - 2013-07-16
+- Minor refactor to bundled sha1 library
+- HTTP header comparisons are now case insensitive. #220, #275
+- Refactors URI to be exception free and not use regular expressions. This
+  eliminates the dependency on boost or C++11 regex libraries allowing native
+  C++11 usage on GCC 4.4 and higher and significantly reduces staticly built
+  binary sizes.
+- Updates handling of Server and User-Agent headers to better handle custom
+  settings and allow suppression of these headers for security purposes.
+- Fix issue where pong timeout handler always fired. Thank you Steven Klassen
+  for reporting this bug.
+- Add ping and pong endpoint wrapper methods
+- Add `get_request()` pass through method to connection to allow calling methods
+  specific to the HTTP policy in use.
+- Fix issue compile error with `WEBSOCKETPP_STRICT_MASKING` enabled and another
+  issue where `WEBSOCKETPP_STRICT_MASKING` was not applied to incoming messages.
+  Thank you Petter Norby for reporting and testing these bugs. #264
+- Add additional macro guards for use with boost_config. Thank you breyed
+  for testing and code. #261
+
+0.3.0-alpha2 - 2013-06-09
+- Fix a regression that caused servers being sent two close frames in a row
+  to end a connection uncleanly. #259
+- Fix a regression that caused spurious frames following a legitimate close
+  frames to erroneously trigger handlers. #258
+- Change default HTTP response error code when no http_handler is defined from
+  500/Internal Server Error to 426/Upgrade Required
+- Remove timezone from logger timestamp to work around issues with the Windows
+  implimentation of strftime. Thank you breyed for testing and code. #257
+- Switch integer literals to char literals to improve VCPP compatibility.
+  Thank you breyed for testing and code. #257
+- Add MSVCPP warning suppression for the bundled SHA1 library. Thank you breyed
+  for testing and code. #257
+
+0.3.0-alpha1 - 2013-06-09
+- Initial Release

cmake/CMakeHelpers.cmake

@@ -72,3 +72,7 @@ endmacro ()
 macro (link_boost)
     target_link_libraries (${TARGET_NAME} ${Boost_LIBRARIES})
 endmacro ()
+
+macro (link_openssl)
+    target_link_libraries (${TARGET_NAME} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
+endmacro ()

examples/associative_storage/associative_storage.cpp

@@ -20,55 +20,55 @@ class print_server {
 public:
     print_server() : m_next_sessionid(1) {
         m_server.init_asio();
-                
+
         m_server.set_open_handler(bind(&print_server::on_open,this,::_1));
         m_server.set_close_handler(bind(&print_server::on_close,this,::_1));
         m_server.set_message_handler(bind(&print_server::on_message,this,::_1,::_2));
     }
-    
+
     void on_open(connection_hdl hdl) {
         connection_data data;
-        
+
         data.sessionid = m_next_sessionid++;
         data.name = "";
-        
+
         m_connections[hdl] = data;
     }
-    
+
     void on_close(connection_hdl hdl) {
         connection_data& data = get_data_from_hdl(hdl);
-        
-        std::cout << "Closing connection " << data.name 
+
+        std::cout << "Closing connection " << data.name
                   << " with sessionid " << data.sessionid << std::endl;
-        
+
         m_connections.erase(hdl);
     }
-    
+
     void on_message(connection_hdl hdl, server::message_ptr msg) {
         connection_data& data = get_data_from_hdl(hdl);
-        
+
         if (data.name == "") {
             data.name = msg->get_payload();
-            std::cout << "Setting name of connection with sessionid " 
+            std::cout << "Setting name of connection with sessionid "
                       << data.sessionid << " to " << data.name << std::endl;
         } else {
-            std::cout << "Got a message from connection " << data.name 
+            std::cout << "Got a message from connection " << data.name
                       << " with sessionid " << data.sessionid << std::endl;
         }
     }
-    
+
     connection_data& get_data_from_hdl(connection_hdl hdl) {
         auto it = m_connections.find(hdl);
-        
+
         if (it == m_connections.end()) {
             // this connection is not in the list. This really shouldn't happen
             // and probably means something else is wrong.
             throw std::invalid_argument("No data available for session");
         }
-        
+
         return it->second;
     }
-    
+
     void run(uint16_t port) {
         m_server.listen(port);
         m_server.start_accept();
@@ -85,4 +85,4 @@ private:
 int main() {
     print_server server;
     server.run(9002);
-}
+}

examples/broadcast_server/SConscript

@@ -17,7 +17,7 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
    prgs += env_cpp11.Program('broadcast_server', ["broadcast_server.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system','thread','regex'],env) + [platform_libs] + [polyfill_libs]
+   ALL_LIBS = boostlibs(['system','thread'],env) + [platform_libs] + [polyfill_libs]
    prgs += env.Program('broadcast_server', ["broadcast_server.cpp"], LIBS = ALL_LIBS)
 
 Return('prgs')

examples/broadcast_server/broadcast_server.cpp

@@ -34,32 +34,33 @@ enum action_type {
 
 struct action {
     action(action_type t, connection_hdl h) : type(t), hdl(h) {}
-    action(action_type t, server::message_ptr m) : type(t), msg(m) {}
-    
+    action(action_type t, connection_hdl h, server::message_ptr m)
+      : type(t), hdl(h), msg(m) {}
+
     action_type type;
     websocketpp::connection_hdl hdl;
     server::message_ptr msg;
 };
- 
+
 class broadcast_server {
 public:
     broadcast_server() {
         // Initialize Asio Transport
         m_server.init_asio();
-        
+
         // Register handler callbacks
         m_server.set_open_handler(bind(&broadcast_server::on_open,this,::_1));
         m_server.set_close_handler(bind(&broadcast_server::on_close,this,::_1));
         m_server.set_message_handler(bind(&broadcast_server::on_message,this,::_1,::_2));
     }
-    
+
     void run(uint16_t port) {
         // listen on specified port
         m_server.listen(port);
-        
+
         // Start the server accept loop
 	    m_server.start_accept();
-	    
+
 	    // Start the ASIO io_service run loop
         try {
             m_server.run();
@@ -71,7 +72,7 @@ public:
             std::cout << "other exception" << std::endl;
         }
     }
-    
+
     void on_open(connection_hdl hdl) {
         unique_lock<mutex> lock(m_action_lock);
         //std::cout << "on_open" << std::endl;
@@ -79,7 +80,7 @@ public:
         lock.unlock();
         m_action_cond.notify_one();
     }
-    
+
     void on_close(connection_hdl hdl) {
         unique_lock<mutex> lock(m_action_lock);
         //std::cout << "on_close" << std::endl;
@@ -87,38 +88,38 @@ public:
         lock.unlock();
         m_action_cond.notify_one();
     }
-    
+
     void on_message(connection_hdl hdl, server::message_ptr msg) {
         // queue message up for sending by processing thread
         unique_lock<mutex> lock(m_action_lock);
         //std::cout << "on_message" << std::endl;
-        m_actions.push(action(MESSAGE,msg));
+        m_actions.push(action(MESSAGE,hdl,msg));
         lock.unlock();
         m_action_cond.notify_one();
     }
-    
+
     void process_messages() {
         while(1) {
             unique_lock<mutex> lock(m_action_lock);
-            
+
             while(m_actions.empty()) {
                 m_action_cond.wait(lock);
             }
-            
+
             action a = m_actions.front();
             m_actions.pop();
-            
+
             lock.unlock();
-            
+
             if (a.type == SUBSCRIBE) {
-                unique_lock<mutex> lock(m_connection_lock);
+                unique_lock<mutex> con_lock(m_connection_lock);
                 m_connections.insert(a.hdl);
             } else if (a.type == UNSUBSCRIBE) {
-                unique_lock<mutex> lock(m_connection_lock);
+                unique_lock<mutex> con_lock(m_connection_lock);
                 m_connections.erase(a.hdl);
             } else if (a.type == MESSAGE) {
-                unique_lock<mutex> lock(m_connection_lock);
-                
+                unique_lock<mutex> con_lock(m_connection_lock);
+
                 con_list::iterator it;
                 for (it = m_connections.begin(); it != m_connections.end(); ++it) {
                     m_server.send(*it,a.msg);
@@ -130,11 +131,11 @@ public:
     }
 private:
     typedef std::set<connection_hdl,std::owner_less<connection_hdl>> con_list;
-    
+
     server m_server;
     con_list m_connections;
     std::queue<action> m_actions;
-    
+
     mutex m_action_lock;
     mutex m_connection_lock;
     condition_variable m_action_cond;
@@ -142,16 +143,16 @@ private:
 
 int main() {
 	try {
-	broadcast_server server;
-	
+	broadcast_server server_instance;
+
 	// Start a thread to run the processing loop
-	thread t(bind(&broadcast_server::process_messages,&server));
-	
+	thread t(bind(&broadcast_server::process_messages,&server_instance));
+
 	// Run the asio loop with the main thread
-	server.run(9002);
-	
+	server_instance.run(9002);
+
 	t.join();
-	
+
 	} catch (std::exception & e) {
 	    std::cout << e.what() << std::endl;
 	}

examples/debug_client/SConscript

@@ -0,0 +1,24 @@
+## Debug client example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+Import('tls_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   prgs += env_cpp11.Program('debug_client', ["debug_client.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   prgs += env.Program('debug_client', ["debug_client.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')

examples/debug_client/debug_client.cpp

@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** ====== WARNING ========
+ * This example is presently used as a scratch space. It may or may not be broken
+ * at any given time.
+ */
+
+#include <websocketpp/config/asio_client.hpp>
+
+#include <websocketpp/client.hpp>
+
+#include <iostream>
+#include <chrono>
+
+typedef websocketpp::client<websocketpp::config::asio_tls_client> client;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+// pull out the type of messages sent by our config
+typedef websocketpp::config::asio_tls_client::message_type::ptr message_ptr;
+typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
+typedef client::connection_ptr connection_ptr;
+
+
+
+class perftest {
+public:
+    typedef perftest type;
+    typedef std::chrono::duration<int,std::micro> dur_type;
+
+    perftest () {
+        m_endpoint.set_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.set_error_channels(websocketpp::log::elevel::all);
+
+        // Initialize ASIO
+        m_endpoint.init_asio();
+
+        // Register our handlers
+        m_endpoint.set_socket_init_handler(bind(&type::on_socket_init,this,::_1));
+        m_endpoint.set_tls_init_handler(bind(&type::on_tls_init,this,::_1));
+        m_endpoint.set_message_handler(bind(&type::on_message,this,::_1,::_2));
+        m_endpoint.set_open_handler(bind(&type::on_open,this,::_1));
+        m_endpoint.set_close_handler(bind(&type::on_close,this,::_1));
+    }
+
+    void start(std::string uri) {
+        websocketpp::lib::error_code ec;
+        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
+
+        if (ec) {
+        	m_endpoint.get_alog().write(websocketpp::log::alevel::app,ec.message());
+        }
+
+        //con->set_proxy("http://humupdates.uchicago.edu:8443");
+
+        m_endpoint.connect(con);
+
+	    // Start the ASIO io_service run loop
+	    m_start = std::chrono::high_resolution_clock::now();
+        m_endpoint.run();
+    }
+
+    void on_socket_init(websocketpp::connection_hdl hdl) {
+        m_socket_init = std::chrono::high_resolution_clock::now();
+    }
+
+    context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
+        m_tls_init = std::chrono::high_resolution_clock::now();
+        context_ptr ctx(new boost::asio::ssl::context(boost::asio::ssl::context::tlsv1));
+
+        try {
+            ctx->set_options(boost::asio::ssl::context::default_workarounds |
+                             boost::asio::ssl::context::no_sslv2 |
+                             boost::asio::ssl::context::single_dh_use);
+        } catch (std::exception& e) {
+            std::cout << e.what() << std::endl;
+        }
+        return ctx;
+    }
+
+    void on_open(websocketpp::connection_hdl hdl) {
+        m_open = std::chrono::high_resolution_clock::now();
+        m_endpoint.send(hdl, "", websocketpp::frame::opcode::text);
+    }
+    void on_message(websocketpp::connection_hdl hdl, message_ptr msg) {
+        m_message = std::chrono::high_resolution_clock::now();
+        m_endpoint.close(hdl,websocketpp::close::status::going_away,"");
+    }
+    void on_close(websocketpp::connection_hdl hdl) {
+        m_close = std::chrono::high_resolution_clock::now();
+
+        std::cout << "Socket Init: " << std::chrono::duration_cast<dur_type>(m_socket_init-m_start).count() << std::endl;
+        std::cout << "TLS Init: " << std::chrono::duration_cast<dur_type>(m_tls_init-m_start).count() << std::endl;
+        std::cout << "Open: " << std::chrono::duration_cast<dur_type>(m_open-m_start).count() << std::endl;
+        std::cout << "Message: " << std::chrono::duration_cast<dur_type>(m_message-m_start).count() << std::endl;
+        std::cout << "Close: " << std::chrono::duration_cast<dur_type>(m_close-m_start).count() << std::endl;
+    }
+private:
+    client m_endpoint;
+
+    std::chrono::high_resolution_clock::time_point m_start;
+    std::chrono::high_resolution_clock::time_point m_socket_init;
+    std::chrono::high_resolution_clock::time_point m_tls_init;
+    std::chrono::high_resolution_clock::time_point m_open;
+    std::chrono::high_resolution_clock::time_point m_message;
+    std::chrono::high_resolution_clock::time_point m_close;
+};
+
+int main(int argc, char* argv[]) {
+	std::string uri = "wss://echo.websocket.org";
+
+	if (argc == 2) {
+	    uri = argv[1];
+	}
+
+	try {
+        perftest endpoint;
+        endpoint.start(uri);
+    } catch (const std::exception & e) {
+        std::cout << e.what() << std::endl;
+    } catch (websocketpp::lib::error_code e) {
+        std::cout << e.message() << std::endl;
+    } catch (...) {
+        std::cout << "other exception" << std::endl;
+    }
+}

examples/debug_server/CMakeLists.txt

@@ -1,11 +1,10 @@
-    
+
 file (GLOB SOURCE_FILES *.cpp)
 file (GLOB HEADER_FILES *.hpp)
 
-init_target (echo_client)
+init_target (debug_server)
 
 build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
 
 link_boost ()
 final_target ()
-

examples/debug_server/SConscript

@@ -1,4 +1,4 @@
-## Main development example
+## Debug server example
 ##
 
 Import('env')
@@ -15,9 +15,9 @@ prgs = []
 # if a C++11 environment is available build using that, otherwise use boost
 if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('echo_client', ["echo_client.cpp"], LIBS = ALL_LIBS)
+   prgs += env_cpp11.Program('debug_server', ["debug_server.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system','regex','random'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('echo_client', ["echo_client.cpp"], LIBS = ALL_LIBS)
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('debug_server', ["debug_server.cpp"], LIBS = ALL_LIBS)
 
 Return('prgs')

examples/debug_server/debug_server.cpp

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** ====== WARNING ========
+ * This example is presently used as a scratch space. It may or may not be broken
+ * at any given time.
+ */
+
+#include <websocketpp/config/debug_asio_no_tls.hpp>
+
+#include <websocketpp/server.hpp>
+
+#include <iostream>
+
+typedef websocketpp::server<websocketpp::config::debug_asio> server;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+// pull out the type of messages sent by our config
+typedef server::message_ptr message_ptr;
+
+// Define a callback to handle incoming messages
+void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
+    std::cout << "on_message called with hdl: " << hdl.lock().get()
+              << " and message: " << msg->get_payload()
+              << std::endl;
+
+    try {
+        s->send(hdl, msg->get_payload(), msg->get_opcode());
+    } catch (const websocketpp::lib::error_code& e) {
+        std::cout << "Echo failed because: " << e
+                  << "(" << e.message() << ")" << std::endl;
+    }
+}
+
+int main() {
+	// Create a server endpoint
+    server echo_server;
+
+	try {
+        // Set logging settings
+        echo_server.set_access_channels(websocketpp::log::alevel::all);
+        echo_server.clear_access_channels(websocketpp::log::alevel::frame_payload);
+
+        // Initialize ASIO
+        echo_server.init_asio();
+        echo_server.set_reuse_addr(true);
+
+        // Register our message handler
+        echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
+
+        // Listen on port 9012
+        echo_server.listen(9012);
+
+        // Start the server accept loop
+        echo_server.start_accept();
+
+	    // Start the ASIO io_service run loop
+        echo_server.run();
+    } catch (const std::exception & e) {
+        std::cout << e.what() << std::endl;
+    } catch (websocketpp::lib::error_code e) {
+        std::cout << e.message() << std::endl;
+    } catch (...) {
+        std::cout << "other exception" << std::endl;
+    }
+}

examples/dev/main.cpp

@@ -32,169 +32,169 @@ typedef websocketpp::server<websocketpp::config::core> server;
 		}
 		return true;
 	}
-	
+
 	void http(connection_ptr con) {
 	    std::cout << "handler http" << std::endl;
 	}
-	
+
 	void on_load(connection_ptr con, ptr old_handler) {
 		std::cout << "handler on_load" << std::endl;
 	}
 	void on_unload(connection_ptr con, ptr new_handler) {
 		std::cout << "handler on_unload" << std::endl;
 	}
-	
+
 	void on_open(connection_ptr con) {
 		std::cout << "handler on_open" << std::endl;
 	}
 	void on_fail(connection_ptr con) {
 		std::cout << "handler on_fail" << std::endl;
 	}
-	
+
 	void on_message(connection_ptr con, message_ptr msg) {
 		std::cout << "handler on_message" << std::endl;
-		
-		
+
+
 	}
-	
+
 	void on_close(connection_ptr con) {
 		std::cout << "handler on_close" << std::endl;
 	}
 };*/
 
 int main() {
-	typedef websocketpp::message_buffer::message<websocketpp::message_buffer::alloc::con_msg_manager> 
+	typedef websocketpp::message_buffer::message<websocketpp::message_buffer::alloc::con_msg_manager>
 		message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_man_type;
 
 	con_msg_man_type::ptr manager(new con_msg_man_type());
-	
+
 	size_t foo = 1024;
-	
+
 	message_type::ptr input = manager->get_message(websocketpp::frame::opcode::TEXT,foo);
 	message_type::ptr output = manager->get_message(websocketpp::frame::opcode::TEXT,foo);
 	websocketpp::frame::masking_key_type key;
-	
+
 	std::random_device dev;
-	
-	
-	
+
+
+
 	key.i = 0x12345678;
-	
+
 	double m = 18094238402394.0824923;
-	
+
 	/*std::cout << "Some Math" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		for (int i = 0; i < foo; i++) {
 			m /= 1.001;
 		}
-		
+
 	}*/
-	
+
 	std::cout << m << std::endl;
-	
+
 	std::cout << "Random Gen" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		input->get_raw_payload().replace(0,foo,foo,'\0');
 		output->get_raw_payload().replace(0,foo,foo,'\0');
 	}
-	
+
 	std::cout << "Out of place accelerated" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		websocketpp::frame::word_mask_exact(reinterpret_cast<uint8_t*>(const_cast<char*>(input->get_raw_payload().data())), reinterpret_cast<uint8_t*>(const_cast<char*>(output->get_raw_payload().data())), foo, key);
 	}
-	
+
 	std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
 	std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-	
+
 	input->get_raw_payload().replace(0,foo,foo,'\0');
 	output->get_raw_payload().replace(0,foo,foo,'\0');
-	
+
 	std::cout << "In place accelerated" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		websocketpp::frame::word_mask_exact(reinterpret_cast<uint8_t*>(const_cast<char*>(input->get_raw_payload().data())), reinterpret_cast<uint8_t*>(const_cast<char*>(input->get_raw_payload().data())), foo, key);
 	}
-	
+
 	std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
 	std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-	
+
 	input->get_raw_payload().replace(0,foo,foo,'\0');
 	output->get_raw_payload().replace(0,foo,foo,'\0');
 	std::cout << "Out of place byte by byte" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		websocketpp::frame::byte_mask(input->get_raw_payload().begin(), input->get_raw_payload().end(), output->get_raw_payload().begin(), key);
 	}
-	
+
 	std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
 	std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-	
+
 	input->get_raw_payload().replace(0,foo,foo,'\0');
 	output->get_raw_payload().replace(0,foo,foo,'\0');
 	std::cout << "In place byte by byte" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		websocketpp::frame::byte_mask(input->get_raw_payload().begin(), input->get_raw_payload().end(), input->get_raw_payload().begin(), key);
 	}
-	
+
 	std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
 	std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-	
+
 	input->get_raw_payload().replace(0,foo,foo,'a');
 	output->get_raw_payload().replace(0,foo,foo,'b');
 	std::cout << "Copy" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		std::copy(input->get_raw_payload().begin(), input->get_raw_payload().end(), output->get_raw_payload().begin());
 	}
-	
+
 	std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
 	std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-	
+
 	/*server::handler::ptr h(new handler());
-	
+
 	server test_server(h);
 	server::connection_ptr con;
-	
+
 	std::stringstream output;
-	
+
 	test_server.register_ostream(&output);
-	
+
 	con = test_server.get_connection();
-	
+
 	con->start();
-	
+
 	//foo.handle_accept(con,true);
-	
+
 	std::stringstream input;
 	input << "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
 	//input << "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
 	input >> *con;
-	
+
 	std::stringstream input2;
 	input2 << "messageabc2";
 	input2 >> *con;
-	
+
 	std::stringstream input3;
 	input3 << "messageabc3";
 	input3 >> *con;
-	
+
 	std::stringstream input4;
 	input4 << "close";
 	input4 >> *con;
-	
+
 	std::cout << "connection output:" << std::endl;
 	std::cout << output.str() << std::endl;*/
 }

examples/echo_server/CMakeLists.txt

@@ -1,4 +1,4 @@
-    
+
 file (GLOB SOURCE_FILES *.cpp)
 file (GLOB HEADER_FILES *.hpp)
 

examples/echo_server/SConscript

@@ -17,7 +17,7 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
    prgs += env_cpp11.Program('echo_server', ["echo_server.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system','regex'],env) + [platform_libs] + [polyfill_libs]
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
    prgs += env.Program('echo_server', ["echo_server.cpp"], LIBS = ALL_LIBS)
 
 Return('prgs')

examples/echo_server/echo_handler.hpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP

examples/echo_server/echo_server.cpp

@@ -15,14 +15,14 @@ typedef server::message_ptr message_ptr;
 
 // Define a callback to handle incoming messages
 void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    std::cout << "on_message called with hdl: " << hdl.lock().get() 
+    std::cout << "on_message called with hdl: " << hdl.lock().get()
               << " and message: " << msg->get_payload()
               << std::endl;
 
     try {
         s->send(hdl, msg->get_payload(), msg->get_opcode());
     } catch (const websocketpp::lib::error_code& e) {
-        std::cout << "Echo failed because: " << e  
+        std::cout << "Echo failed because: " << e
                   << "(" << e.message() << ")" << std::endl;
     }
 }
@@ -30,24 +30,24 @@ void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
 int main() {
 	// Create a server endpoint
     server echo_server;
-	
+
 	try {
         // Set logging settings
         echo_server.set_access_channels(websocketpp::log::alevel::all);
         echo_server.clear_access_channels(websocketpp::log::alevel::frame_payload);
-        
+
         // Initialize ASIO
         echo_server.init_asio();
-        
+
         // Register our message handler
         echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
-        
+
         // Listen on port 9002
         echo_server.listen(9002);
-        
+
         // Start the server accept loop
         echo_server.start_accept();
-	    
+
 	    // Start the ASIO io_service run loop
         echo_server.run();
     } catch (const std::exception & e) {

examples/echo_server_tls/CMakeLists.txt

@@ -0,0 +1,15 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+
+if (OPENSSL_FOUND)
+
+init_target (echo_server_tls)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+link_openssl()
+final_target ()
+endif()

examples/echo_server_tls/SConscript

@@ -18,7 +18,7 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
    prgs += env_cpp11.Program('echo_server_tls', ["echo_server_tls.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system','regex'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
    prgs += env.Program('echo_server_tls', ["echo_server_tls.cpp"], LIBS = ALL_LIBS)
 
 Return('prgs')

examples/echo_server_tls/echo_handler_tls.hpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP

examples/echo_server_tls/echo_server_tls.cpp

@@ -15,14 +15,14 @@ typedef websocketpp::config::asio::message_type::ptr message_ptr;
 typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
 
 void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    std::cout << "on_message called with hdl: " << hdl.lock().get() 
+    std::cout << "on_message called with hdl: " << hdl.lock().get()
               << " and message: " << msg->get_payload()
               << std::endl;
 
     try {
         s->send(hdl, msg->get_payload(), msg->get_opcode());
     } catch (const websocketpp::lib::error_code& e) {
-        std::cout << "Echo failed because: " << e  
+        std::cout << "Echo failed because: " << e
                   << "(" << e.message() << ")" << std::endl;
     }
 }
@@ -51,7 +51,7 @@ context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
 int main() {
     // Create a server endpoint
 	server echo_server;
-	
+
     // Initialize ASIO
 	echo_server.init_asio();
 
@@ -59,10 +59,10 @@ int main() {
     echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
     echo_server.set_tls_init_handler(bind(&on_tls_init,::_1));
 
-	
+
 	// Listen on port 9002
 	echo_server.listen(9002);
-	
+
 	// Start the server accept loop
 	echo_server.start_accept();
 

examples/handler_switch/handler_switch.cpp

@@ -17,12 +17,12 @@ void custom_on_msg(server & s, connection_hdl hdl, server::message_ptr msg) {
 
 void default_on_msg(server & s, connection_hdl hdl, server::message_ptr msg) {
     std::cout << "Message sent to default handler" << std::endl;
-    
+
     if (msg->get_payload() == "upgrade") {
         // Upgrade our connection_hdl to a full connection_ptr
         server::connection_ptr con = s.get_con_from_hdl(hdl);
-        
-        // Change the on message handler for this connection only to 
+
+        // Change the on message handler for this connection only to
         // custom_on_mesage
         con->set_message_handler(bind(&custom_on_msg,ref(s),::_1,::_2));
         std::cout << "Upgrading connection to custom handler" << std::endl;
@@ -39,4 +39,4 @@ int main() {
     s.start_accept();
 
     s.run();
-}
+}

examples/iostream_server/SConscript

@@ -17,7 +17,7 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
    prgs += env_cpp11.Program('iostream_server', ["iostream_server.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system','regex'],env) + [platform_libs] + [polyfill_libs]
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
    prgs += env.Program('iostream_server', ["iostream_server.cpp"], LIBS = ALL_LIBS)
 
 Return('prgs')

examples/iostream_server/iostream_server.cpp

@@ -17,17 +17,17 @@ typedef server::message_ptr message_ptr;
 // Define a callback to handle incoming messages
 void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
     if (msg->get_opcode() == websocketpp::frame::opcode::text) {
-        s->get_alog().write(websocketpp::log::alevel::app, 
+        s->get_alog().write(websocketpp::log::alevel::app,
                 	"Text Message Received: "+msg->get_payload());
     } else {
-        s->get_alog().write(websocketpp::log::alevel::app, 
+        s->get_alog().write(websocketpp::log::alevel::app,
                 	"Binary Message Received: "+websocketpp::utility::to_hex(msg->get_payload()));
-    }  
-    
+    }
+
     try {
         s->send(hdl, msg->get_payload(), msg->get_opcode());
     } catch (const websocketpp::lib::error_code& e) {
-        s->get_alog().write(websocketpp::log::alevel::app, 
+        s->get_alog().write(websocketpp::log::alevel::app,
                 	"Echo Failed: "+e.message());
     }
 }
@@ -35,50 +35,52 @@ void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
 int main() {
     server s;
     std::ofstream log;
-	
-	try {        
+
+	try {
         // set up access channels to only log interesting things
         s.clear_access_channels(websocketpp::log::alevel::all);
         s.set_access_channels(websocketpp::log::alevel::connect);
         s.set_access_channels(websocketpp::log::alevel::disconnect);
         s.set_access_channels(websocketpp::log::alevel::app);
-        
-        // Log to a file rather than stdout, as we are using stdout for real 
+
+        // Log to a file rather than stdout, as we are using stdout for real
         // output
         log.open("output.log");
         s.get_alog().set_ostream(&log);
         s.get_elog().set_ostream(&log);
-        
+
         // print all output to stdout
         s.register_ostream(&std::cout);
-        
+
         // Register our message handler
         s.set_message_handler(bind(&on_message,&s,::_1,::_2));
-        
+
         server::connection_ptr con = s.get_connection();
-        
+
         con->start();
-        
-        // C++ iostream's don't support the idea of asynchronous i/o. As such 
-        // there are two input strategies demonstrated here. Buffered I/O will 
-        // read from stdin in chunks until EOF. This works very well for 
+
+        // C++ iostream's don't support the idea of asynchronous i/o. As such
+        // there are two input strategies demonstrated here. Buffered I/O will
+        // read from stdin in chunks until EOF. This works very well for
         // replaying canned connections as would be done in automated testing.
         //
-        // If the server is being used live however, assuming input is being 
-        // piped from elsewhere in realtime, this strategy will result in small 
-        // messages being buffered forever. The non-buffered strategy below  
-        // reads characters from stdin one at a time. This is inefficient and 
-        // for more serious uses should be replaced with a platform specific 
+        // If the server is being used live however, assuming input is being
+        // piped from elsewhere in realtime, this strategy will result in small
+        // messages being buffered forever. The non-buffered strategy below
+        // reads characters from stdin one at a time. This is inefficient and
+        // for more serious uses should be replaced with a platform specific
         // asyncronous i/o technique like select, poll, IOCP, etc
         bool buffered_io = false;
-        
+
         if (buffered_io) {
             std::cin >> *con;
+            con->eof();
         } else {
             char a;
             while(std::cin.get(a)) {
-                con->readsome(&a,1);
+                con->read_some(&a,1);
             }
+            con->eof();
         }
     } catch (const std::exception & e) {
         std::cout << e.what() << std::endl;
@@ -88,4 +90,4 @@ int main() {
         std::cout << "other exception" << std::endl;
     }
     log.close();
-}
+}

examples/print_server/CMakeLists.txt

@@ -0,0 +1,10 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (print_server)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()

examples/print_server/SConscript

@@ -17,7 +17,7 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
    prgs += env_cpp11.Program('print_server', ["print_server.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system','regex'],env) + [platform_libs] + [polyfill_libs]
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
    prgs += env.Program('print_server', ["print_server.cpp"], LIBS = ALL_LIBS)
 
 Return('prgs')

examples/simple_broadcast_server/simple_broadcast_server.cpp

@@ -13,20 +13,20 @@ class broadcast_server {
 public:
     broadcast_server() {
         m_server.init_asio();
-                
+
         m_server.set_open_handler(bind(&broadcast_server::on_open,this,::_1));
         m_server.set_close_handler(bind(&broadcast_server::on_close,this,::_1));
         m_server.set_message_handler(bind(&broadcast_server::on_message,this,::_1,::_2));
     }
-    
+
     void on_open(connection_hdl hdl) {
         m_connections.insert(hdl);
     }
-    
+
     void on_close(connection_hdl hdl) {
         m_connections.erase(hdl);
     }
-    
+
     void on_message(connection_hdl hdl, server::message_ptr msg) {
         for (auto it : m_connections) {
             m_server.send(it,msg);
@@ -48,4 +48,4 @@ private:
 int main() {
     broadcast_server server;
     server.run(9002);
-}
+}

examples/sip_client/CMakeLists.txt

@@ -1,4 +1,4 @@
-    
+
 file (GLOB SOURCE_FILES *.cpp)
 file (GLOB HEADER_FILES *.hpp)
 

examples/sip_client/SConscript

@@ -1,4 +1,4 @@
-## Main development example
+## SIP client example
 ##
 
 Import('env')
@@ -17,7 +17,7 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
    prgs += env_cpp11.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system','regex','random'],env) + [platform_libs] + [polyfill_libs]
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
    prgs += env.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS)
 
 Return('prgs')

examples/sip_client/sip_client.cpp

@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-#include <boost/thread/thread.hpp> 
+#include <boost/thread/thread.hpp>
 
 typedef websocketpp::client<websocketpp::config::asio_client> client;
 
@@ -21,12 +21,12 @@ typedef websocketpp::config::asio_client::message_type::ptr message_ptr;
 client sip_client;
 
 
-bool received; 
+bool received;
 
 void on_open(client* c, websocketpp::connection_hdl hdl) {
     // now it is safe to use the connection
     std::cout << "connection ready" << std::endl;
-    
+
     received=false;
     // Send a SIP OPTIONS message to the server:
     std::string SIP_msg="OPTIONS sip:carol@chicago.com SIP/2.0\r\nVia: SIP/2.0/WS df7jal23ls0d.invalid;rport;branch=z9hG4bKhjhs8ass877\r\nMax-Forwards: 70\r\nTo: <sip:carol@chicago.com>\r\nFrom: Alice <sip:alice@atlanta.com>;tag=1928301774\r\nCall-ID: a84b4c76e66710\r\nCSeq: 63104 OPTIONS\r\nContact: <sip:alice@pc33.atlanta.com>\r\nAccept: application/sdp\r\nContent-Length: 0\r\n\r\n";
@@ -35,32 +35,32 @@ void on_open(client* c, websocketpp::connection_hdl hdl) {
 
 void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
     client::connection_ptr con = sip_client.get_con_from_hdl(hdl);
-    
+
     std::cout << "Received a reply:" << std::endl;
     fwrite(msg->get_payload().c_str(), msg->get_payload().size(), 1, stdout);
     received=true;
 }
 
 int main(int argc, char* argv[]) {
-	
+
 	std::string uri = "ws://localhost:9001";
-	
+
 	if (argc == 2) {
 	    uri = argv[1];
 	}
-	
+
 	try {
         // We expect there to be a lot of errors, so suppress them
         sip_client.clear_access_channels(websocketpp::log::alevel::all);
         sip_client.clear_error_channels(websocketpp::log::elevel::all);
-        
+
         // Initialize ASIO
         sip_client.init_asio();
-        
+
         // Register our handlers
         sip_client.set_open_handler(bind(&on_open,&sip_client,::_1));
         sip_client.set_message_handler(bind(&on_message,&sip_client,::_1,::_2));
-        
+
         websocketpp::lib::error_code ec;
         client::connection_ptr con = sip_client.get_connection(uri, ec);
 
@@ -68,16 +68,16 @@ int main(int argc, char* argv[]) {
         con->add_subprotocol("sip");
 
         sip_client.connect(con);
-	    
+
 	    // Start the ASIO io_service run loop
         sip_client.run();
-        
+
         while(!received) {
             boost::this_thread::sleep(boost::posix_time::milliseconds(100));
         }
-        
+
         std::cout << "done" << std::endl;
-        
+
     } catch (const std::exception & e) {
         std::cout << e.what() << std::endl;
     } catch (websocketpp::lib::error_code e) {

examples/subprotocol_server/SConscript

@@ -17,7 +17,7 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
    prgs += env_cpp11.Program('subprotocol_server', ["subprotocol_server.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system','regex'],env) + [platform_libs] + [polyfill_libs]
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
    prgs += env.Program('subprotocol_server', ["subprotocol_server.cpp"], LIBS = ALL_LIBS)
 
 Return('prgs')

examples/subprotocol_server/subprotocol_server.cpp

@@ -14,20 +14,20 @@ using websocketpp::lib::ref;
 
 bool validate(server & s, connection_hdl hdl) {
     server::connection_ptr con = s.get_con_from_hdl(hdl);
-    
+
     std::cout << "Cache-Control: " << con->get_request_header("Cache-Control") << std::endl;
-    
+
     const std::vector<std::string> & subp_requests = con->get_requested_subprotocols();
     std::vector<std::string>::const_iterator it;
-    
+
     for (it = subp_requests.begin(); it != subp_requests.end(); ++it) {
         std::cout << "Requested: " << *it << std::endl;
     }
-    
+
     if (subp_requests.size() > 0) {
         con->select_subprotocol(subp_requests[0]);
     }
-    
+
     return true;
 }
 
@@ -49,4 +49,4 @@ int main() {
     } catch (...) {
         std::cout << "other exception" << std::endl;
     }
-}
+}

examples/telemetry_client/CMakeLists.txt

@@ -0,0 +1,10 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (telemetry_client)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()

examples/telemetry_client/SConscript

@@ -17,7 +17,7 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
    prgs += env_cpp11.Program('telemetry_client', ["telemetry_client.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system','regex','random'],env) + [platform_libs] + [polyfill_libs]
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
    prgs += env.Program('telemetry_client', ["telemetry_client.cpp"], LIBS = ALL_LIBS)
 
 Return('prgs')

examples/telemetry_client/telemetry_client.cpp

@@ -9,24 +9,24 @@
 /**
  * The telemetry client connects to a WebSocket server and sends a message every
  * second containing an integer count. This example can be used as the basis for
- * programs where a client connects and pushes data for logging, stress/load 
+ * programs where a client connects and pushes data for logging, stress/load
  * testing, etc.
  */
 class telemetry_client {
 public:
     typedef websocketpp::client<websocketpp::config::asio_client> client;
     typedef websocketpp::lib::lock_guard<websocketpp::lib::mutex> scoped_lock;
-    
+
     telemetry_client() : m_open(false),m_done(false) {
         // set up access channels to only log interesting things
         m_client.clear_access_channels(websocketpp::log::alevel::all);
         m_client.set_access_channels(websocketpp::log::alevel::connect);
         m_client.set_access_channels(websocketpp::log::alevel::disconnect);
         m_client.set_access_channels(websocketpp::log::alevel::app);
-        
+
         // Initialize the Asio transport policy
         m_client.init_asio();
-        
+
         // Bind the handlers we are using
         using websocketpp::lib::placeholders::_1;
         using websocketpp::lib::bind;
@@ -34,98 +34,104 @@ public:
         m_client.set_close_handler(bind(&telemetry_client::on_close,this,::_1));
         m_client.set_fail_handler(bind(&telemetry_client::on_fail,this,::_1));
     }
-    
+
     // This method will block until the connection is complete
     void run(const std::string & uri) {
     	// Create a new connection to the given URI
         websocketpp::lib::error_code ec;
         client::connection_ptr con = m_client.get_connection(uri, ec);
         if (ec) {
-        	m_client.get_alog().write(websocketpp::log::alevel::app, 
+        	m_client.get_alog().write(websocketpp::log::alevel::app,
                 	"Get Connection Error: "+ec.message());
         	return;
         }
-        
-        // Grab a handle for this connection so we can talk to it in a thread 
+
+        // Grab a handle for this connection so we can talk to it in a thread
         // safe manor after the event loop starts.
         m_hdl = con->get_handle();
-        
+
         // Queue the connection. No DNS queries or network connections will be
         // made until the io_service event loop is run.
         m_client.connect(con);
-        
+
         // Create a thread to run the ASIO io_service event loop
         websocketpp::lib::thread asio_thread(&client::run, &m_client);
-        
+
         // Create a thread to run the telemetry loop
         websocketpp::lib::thread telemetry_thread(&telemetry_client::telemetry_loop,this);
-        
+
         asio_thread.join();
         telemetry_thread.join();
     }
-    
+
     // The open handler will signal that we are ready to start sending telemetry
     void on_open(websocketpp::connection_hdl hdl) {
-        m_client.get_alog().write(websocketpp::log::alevel::app, 
+        m_client.get_alog().write(websocketpp::log::alevel::app,
             "Connection opened, starting telemetry!");
-        
+
         scoped_lock guard(m_lock);
         m_open = true;
     }
-    
+
     // The close handler will signal that we should stop sending telemetry
     void on_close(websocketpp::connection_hdl hdl) {
-        m_client.get_alog().write(websocketpp::log::alevel::app, 
+        m_client.get_alog().write(websocketpp::log::alevel::app,
             "Connection closed, stopping telemetry!");
-        
+
         scoped_lock guard(m_lock);
         m_done = true;
     }
-    
+
     // The fail handler will signal that we should stop sending telemetry
     void on_fail(websocketpp::connection_hdl hdl) {
-        m_client.get_alog().write(websocketpp::log::alevel::app, 
+        m_client.get_alog().write(websocketpp::log::alevel::app,
             "Connection failed, stopping telemetry!");
-        
+
         scoped_lock guard(m_lock);
         m_done = true;
     }
-    
+
     void telemetry_loop() {
         uint64_t count = 0;
         std::stringstream val;
         websocketpp::lib::error_code ec;
-        
+
         while(1) {
+            bool wait = false;
+
             {
                 scoped_lock guard(m_lock);
                 // If the connection has been closed, stop generating telemetry
                 if (m_done) {break;}
-                
+
                 // If the connection hasn't been opened yet wait a bit and retry
                 if (!m_open) {
-                    sleep(1);
-                    continue;
+                    wait = true;
                 }
             }
-            
+
+            if (wait) {
+                sleep(1);
+                continue;
+            }
+
             val.str("");
             val << "count is " << count++;
-        
+
             m_client.get_alog().write(websocketpp::log::alevel::app, val.str());
             m_client.send(m_hdl,val.str(),websocketpp::frame::opcode::text,ec);
-            
+
             // The most likely error that we will get is that the connection is
-            // not in the right state. Usually this means we tried to send a 
-            // message to a connection that was closed or in the process of 
-            // closing. While many errors here can be easily recovered from, 
+            // not in the right state. Usually this means we tried to send a
+            // message to a connection that was closed or in the process of
+            // closing. While many errors here can be easily recovered from,
             // in this simple example, we'll stop the telemetry loop.
             if (ec) {
-                m_client.get_alog().write(websocketpp::log::alevel::app, 
+                m_client.get_alog().write(websocketpp::log::alevel::app,
                 	"Send Error: "+ec.message());
                 break;
             }
-        
+
             sleep(1);
         }
     }
@@ -139,12 +145,12 @@ private:
 
 int main(int argc, char* argv[]) {
     telemetry_client c;
-    
+
     std::string uri = "ws://localhost:9002";
-    
+
     if (argc == 2) {
         uri = argv[1];
     }
-    
+
     c.run(uri);
 }

examples/testee_client/CMakeLists.txt

@@ -0,0 +1,11 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (testee_client)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+

examples/testee_client/SConscript

@@ -0,0 +1,23 @@
+## Autobahn test client example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   prgs += env_cpp11.Program('testee_client', ["testee_client.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('testee_client', ["testee_client.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')

examples/testee_client/testee_client.cpp

@@ -17,9 +17,10 @@ int case_count = 0;
 
 void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
     client::connection_ptr con = c->get_con_from_hdl(hdl);
-    
+
     if (con->get_resource() == "/getCaseCount") {
-        std::cout << "Detected " << msg->get_payload() << " test cases." << std::endl;
+        std::cout << "Detected " << msg->get_payload() << " test cases."
+                  << std::endl;
         case_count = atoi(msg->get_payload().c_str());
     } else {
         c->send(hdl, msg->get_payload(), msg->get_opcode());
@@ -28,50 +29,51 @@ void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
 
 int main(int argc, char* argv[]) {
 	// Create a server endpoint
-    client echo_client;
-	
+    client c;
+
 	std::string uri = "ws://localhost:9001";
-	
+
 	if (argc == 2) {
 	    uri = argv[1];
 	}
-	
+
 	try {
         // We expect there to be a lot of errors, so suppress them
-        echo_client.clear_access_channels(websocketpp::log::alevel::all);
-        echo_client.clear_error_channels(websocketpp::log::elevel::all);
-        
+        c.clear_access_channels(websocketpp::log::alevel::all);
+        c.clear_error_channels(websocketpp::log::elevel::all);
+
         // Initialize ASIO
-        echo_client.init_asio();
-        
+        c.init_asio();
+
         // Register our handlers
-        echo_client.set_message_handler(bind(&on_message,&echo_client,::_1,::_2));
-        
+        c.set_message_handler(bind(&on_message,&c,::_1,::_2));
+
         websocketpp::lib::error_code ec;
-        client::connection_ptr con = echo_client.get_connection(uri+"/getCaseCount", ec);
-        echo_client.connect(con);
-	    
+        client::connection_ptr con = c.get_connection(uri+"/getCaseCount", ec);
+        c.connect(con);
+
 	    // Start the ASIO io_service run loop
-        echo_client.run();
-        
+        c.run();
+
         std::cout << "case count: " << case_count << std::endl;
-        
+
         for (int i = 1; i <= case_count; i++) {
-            echo_client.reset();
-            
+            c.reset();
+
             std::stringstream url;
-            
-            url << uri << "/runCase?case=" << i << "&agent=WebSocket++/0.3.0-dev";
-            
-            con = echo_client.get_connection(url.str(), ec);
-                        
-            echo_client.connect(con);
-            
-            echo_client.run();
+
+            url << uri << "/runCase?case=" << i << "&agent="
+                << websocketpp::user_agent;
+
+            con = c.get_connection(url.str(), ec);
+
+            c.connect(con);
+
+            c.run();
         }
-        
+
         std::cout << "done" << std::endl;
-        
+
     } catch (const std::exception & e) {
         std::cout << e.what() << std::endl;
     } catch (websocketpp::lib::error_code e) {

examples/testee_server/SConscript

@@ -17,7 +17,7 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
    prgs += env_cpp11.Program('testee_server', ["testee_server.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system','regex'],env) + [platform_libs] + [polyfill_libs]
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
    prgs += env.Program('testee_server', ["testee_server.cpp"], LIBS = ALL_LIBS)
 
 Return('prgs')

examples/testee_server/testee_server.cpp

@@ -29,7 +29,44 @@
 #include <websocketpp/server.hpp>
 #include <iostream>
 
-typedef websocketpp::server<websocketpp::config::asio> server;
+struct testee_config : public websocketpp::config::asio {
+    // pull default settings from our core config
+    typedef websocketpp::config::asio core;
+
+    typedef core::concurrency_type concurrency_type;
+    typedef core::request_type request_type;
+    typedef core::response_type response_type;
+    typedef core::message_type message_type;
+    typedef core::con_msg_manager_type con_msg_manager_type;
+    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef core::alog_type alog_type;
+    typedef core::elog_type elog_type;
+    typedef core::rng_type rng_type;
+    typedef core::endpoint_base endpoint_base;
+
+    static bool const enable_multithreading = true;
+
+    struct transport_config : public core::transport_config {
+        typedef core::concurrency_type concurrency_type;
+        typedef core::elog_type elog_type;
+        typedef core::alog_type alog_type;
+        typedef core::request_type request_type;
+        typedef core::response_type response_type;
+
+        static bool const enable_multithreading = true;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config>
+        transport_type;
+
+    static const websocketpp::log::level elog_level =
+        websocketpp::log::elevel::none;
+    static const websocketpp::log::level alog_level =
+        websocketpp::log::alevel::none;
+};
+
+typedef websocketpp::server<testee_config> server;
 
 using websocketpp::lib::placeholders::_1;
 using websocketpp::lib::placeholders::_2;
@@ -43,33 +80,62 @@ void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
     s->send(hdl, msg->get_payload(), msg->get_opcode());
 }
 
-int main() {
-	// Create a server endpoint
+void on_socket_init(websocketpp::connection_hdl hdl, boost::asio::ip::tcp::socket & s) {
+    boost::asio::ip::tcp::no_delay option(true);
+    s.set_option(option);
+}
+
+int main(int argc, char * argv[]) {
+    // Create a server endpoint
     server testee_server;
 
-	try {
+    short port = 9002;
+    size_t num_threads = 1;
+
+    if (argc == 3) {
+        port = atoi(argv[1]);
+        num_threads = atoi(argv[2]);
+    }
+
+    try {
         // Total silence
         testee_server.clear_access_channels(websocketpp::log::alevel::all);
         testee_server.clear_error_channels(websocketpp::log::alevel::all);
 
         // Initialize ASIO
         testee_server.init_asio();
+        testee_server.set_reuse_addr(true);
 
         // Register our message handler
         testee_server.set_message_handler(bind(&on_message,&testee_server,::_1,::_2));
+        testee_server.set_socket_init_handler(bind(&on_socket_init,::_1,::_2));
 
-        // Listen on port 9002
-        testee_server.listen(9002);
+        // Listen on specified port with extended listen backlog
+        testee_server.set_listen_backlog(8192);
+        testee_server.listen(port);
 
         // Start the server accept loop
         testee_server.start_accept();
 
-	    // Start the ASIO io_service run loop
-        testee_server.run();
+        // Start the ASIO io_service run loop
+        if (num_threads == 1) {
+            testee_server.run();
+        } else {
+            typedef websocketpp::lib::shared_ptr<websocketpp::lib::thread> thread_ptr;
+            std::vector<thread_ptr> ts;
+            for (size_t i = 0; i < num_threads; i++) {
+                ts.push_back(thread_ptr(new websocketpp::lib::thread(&server::run, &testee_server)));
+            }
+
+            for (size_t i = 0; i < num_threads; i++) {
+                ts[i]->join();
+            }
+        }
+
     } catch (const std::exception & e) {
-        std::cout << e.what() << std::endl;
+        std::cout << "exception: " << e.what() << std::endl;
     } catch (websocketpp::lib::error_code e) {
-        std::cout << e.message() << std::endl;
+        std::cout << "error code: " << e.message() << std::endl;
     } catch (...) {
         std::cout << "other exception" << std::endl;
     }

examples/utility_client/CMakeLists.txt

@@ -0,0 +1,11 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (utility_client)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+

examples/utility_client/SConscript

@@ -6,7 +6,6 @@ Import('env_cpp11')
 Import('boostlibs')
 Import('platform_libs')
 Import('polyfill_libs')
-Import('tls_libs')
 
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
@@ -15,10 +14,10 @@ prgs = []
 
 # if a C++11 environment is available build using that, otherwise use boost
 if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
    prgs += env_cpp11.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system','regex','random'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
    prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
 
 Return('prgs')

examples/utility_client/utility_client.cpp

@@ -1,126 +1,270 @@
-/**
- * This example is presently used as a scratch space. It may or may not be broken
- * at any given time.
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <websocketpp/config/asio_client.hpp>
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
 
+#include <websocketpp/config/asio_no_tls_client.hpp>
 #include <websocketpp/client.hpp>
 
+#include <websocketpp/common/thread.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <cstdlib>
 #include <iostream>
-#include <chrono>
+#include <map>
+#include <string>
+#include <sstream>
 
-typedef websocketpp::client<websocketpp::config::asio_tls_client> client;
+typedef websocketpp::client<websocketpp::config::asio_client> client;
 
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind; 
-
-// pull out the type of messages sent by our config
-typedef websocketpp::config::asio_tls_client::message_type::ptr message_ptr;
-typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
-typedef client::connection_ptr connection_ptr;
-
-
-
-class perftest {
+class connection_metadata {
 public:
-    typedef perftest type;
-    typedef std::chrono::duration<int,std::micro> dur_type;
-    
-    perftest () {
-        m_endpoint.set_access_channels(websocketpp::log::alevel::all);
-        m_endpoint.set_error_channels(websocketpp::log::elevel::all);
-        
-        // Initialize ASIO
-        m_endpoint.init_asio();
-        
-        // Register our handlers
-        m_endpoint.set_socket_init_handler(bind(&type::on_socket_init,this,::_1));
-        m_endpoint.set_tls_init_handler(bind(&type::on_tls_init,this,::_1));
-        m_endpoint.set_message_handler(bind(&type::on_message,this,::_1,::_2));
-        m_endpoint.set_open_handler(bind(&type::on_open,this,::_1));
-        m_endpoint.set_close_handler(bind(&type::on_close,this,::_1));
-    }
-    
-    void start(std::string uri) {
-        websocketpp::lib::error_code ec;
-        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
-        
-        if (ec) {
-        	m_endpoint.get_alog().write(websocketpp::log::alevel::app,ec.message());
-        }
-        
-        //con->set_proxy("http://humupdates.uchicago.edu:8443");
-        
-        m_endpoint.connect(con);
-	    
-	    // Start the ASIO io_service run loop
-	    m_start = std::chrono::high_resolution_clock::now();
-        m_endpoint.run();
-    }
-    
-    void on_socket_init(websocketpp::connection_hdl hdl) {
-        m_socket_init = std::chrono::high_resolution_clock::now();
-    }
-    
-    context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
-        m_tls_init = std::chrono::high_resolution_clock::now();
-        context_ptr ctx(new boost::asio::ssl::context(boost::asio::ssl::context::tlsv1));
+    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
 
-        try {
-            ctx->set_options(boost::asio::ssl::context::default_workarounds |
-                             boost::asio::ssl::context::no_sslv2 |
-                             boost::asio::ssl::context::single_dh_use);
-        } catch (std::exception& e) {
-            std::cout << e.what() << std::endl;
-        }
-        return ctx;
+    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
+      : m_id(id)
+      , m_hdl(hdl)
+      , m_status("Connecting")
+      , m_uri(uri)
+      , m_server("N/A")
+    {}
+
+    void on_open(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Open";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+    }
+
+    void on_fail(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Failed";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+        m_error_reason = con->get_ec().message();
     }
     
-    void on_open(websocketpp::connection_hdl hdl) {
-        m_open = std::chrono::high_resolution_clock::now();
-        m_endpoint.send(hdl, "", websocketpp::frame::opcode::text);
+    void on_close(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Closed";
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        std::stringstream s;
+        s << "close code: " << con->get_remote_close_code() << " (" 
+          << websocketpp::close::status::get_string(con->get_remote_close_code()) 
+          << "), close reason: " << con->get_remote_close_reason();
+        m_error_reason = s.str();
     }
-    void on_message(websocketpp::connection_hdl hdl, message_ptr msg) {
-        m_message = std::chrono::high_resolution_clock::now();
-        m_endpoint.close(hdl,websocketpp::close::status::going_away,"");
+
+    websocketpp::connection_hdl get_hdl() const {
+        return m_hdl;
     }
-    void on_close(websocketpp::connection_hdl hdl) {
-        m_close = std::chrono::high_resolution_clock::now();
-                
-        std::cout << "Socket Init: " << std::chrono::duration_cast<dur_type>(m_socket_init-m_start).count() << std::endl;
-        std::cout << "TLS Init: " << std::chrono::duration_cast<dur_type>(m_tls_init-m_start).count() << std::endl;
-        std::cout << "Open: " << std::chrono::duration_cast<dur_type>(m_open-m_start).count() << std::endl;
-        std::cout << "Message: " << std::chrono::duration_cast<dur_type>(m_message-m_start).count() << std::endl;
-        std::cout << "Close: " << std::chrono::duration_cast<dur_type>(m_close-m_start).count() << std::endl;
+    
+    int get_id() const {
+        return m_id;
     }
+    
+    std::string get_status() const {
+        return m_status;
+    }
+
+    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
 private:
-    client m_endpoint;
-    
-    std::chrono::high_resolution_clock::time_point m_start;
-    std::chrono::high_resolution_clock::time_point m_socket_init;
-    std::chrono::high_resolution_clock::time_point m_tls_init;
-    std::chrono::high_resolution_clock::time_point m_open;
-    std::chrono::high_resolution_clock::time_point m_message;
-    std::chrono::high_resolution_clock::time_point m_close;
+    int m_id;
+    websocketpp::connection_hdl m_hdl;
+    std::string m_status;
+    std::string m_uri;
+    std::string m_server;
+    std::string m_error_reason;
 };
 
-int main(int argc, char* argv[]) {
-	std::string uri = "wss://echo.websocket.org";
-	
-	if (argc == 2) {
-	    uri = argv[1];
-	}
-	
-	try {
-        perftest endpoint;
-        endpoint.start(uri);
-    } catch (const std::exception & e) {
-        std::cout << e.what() << std::endl;
-    } catch (websocketpp::lib::error_code e) {
-        std::cout << e.message() << std::endl;
-    } catch (...) {
-        std::cout << "other exception" << std::endl;
+std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
+    out << "> URI: " << data.m_uri << "\n"
+        << "> Status: " << data.m_status << "\n"
+        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
+        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason);
+
+    return out;
+}
+
+class websocket_endpoint {
+public:
+    websocket_endpoint () : m_next_id(0) {
+        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
+
+        m_endpoint.init_asio();
+        m_endpoint.start_perpetual();
+
+        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
     }
+
+    ~websocket_endpoint() {
+        m_endpoint.stop_perpetual();
+        
+        for (con_list::const_iterator it = m_connection_list.begin(); it != m_connection_list.end(); ++it) {
+            if (it->second->get_status() != "Open") {
+                // Only close open connections
+                continue;
+            }
+            
+            std::cout << "> Closing connection " << it->second->get_id() << std::endl;
+            
+            websocketpp::lib::error_code ec;
+            m_endpoint.close(it->second->get_hdl(), websocketpp::close::status::going_away, "", ec);
+            if (ec) {
+                std::cout << "> Error closing connection " << it->second->get_id() << ": "  
+                          << ec.message() << std::endl;
+            }
+        }
+        
+        m_thread->join();
+    }
+
+    int connect(std::string const & uri) {
+        websocketpp::lib::error_code ec;
+
+        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
+
+        if (ec) {
+            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
+            return -1;
+        }
+
+        int new_id = m_next_id++;
+        connection_metadata::ptr metadata_ptr(new connection_metadata(new_id, con->get_handle(), uri));
+        m_connection_list[new_id] = metadata_ptr;
+
+        con->set_open_handler(websocketpp::lib::bind(
+            &connection_metadata::on_open,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_fail_handler(websocketpp::lib::bind(
+            &connection_metadata::on_fail,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_close_handler(websocketpp::lib::bind(
+            &connection_metadata::on_close,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+
+        m_endpoint.connect(con);
+
+        return new_id;
+    }
+
+    void close(int id, websocketpp::close::status::value code, std::string reason) {
+        websocketpp::lib::error_code ec;
+        
+        con_list::iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            std::cout << "> No connection found with id " << id << std::endl;
+            return;
+        }
+        
+        m_endpoint.close(metadata_it->second->get_hdl(), code, reason, ec);
+        if (ec) {
+            std::cout << "> Error initiating close: " << ec.message() << std::endl;
+        }
+    }
+
+    connection_metadata::ptr get_metadata(int id) const {
+        con_list::const_iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            return connection_metadata::ptr();
+        } else {
+            return metadata_it->second;
+        }
+    }
+private:
+    typedef std::map<int,connection_metadata::ptr> con_list;
+
+    client m_endpoint;
+    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
+
+    con_list m_connection_list;
+    int m_next_id;
+};
+
+int main() {
+    bool done = false;
+    std::string input;
+    websocket_endpoint endpoint;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "connect <ws uri>\n"
+                << "close <connection id> [<close code:default=1000>] [<close reason>]\n"
+                << "show <connection id>\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else if (input.substr(0,7) == "connect") {
+            int id = endpoint.connect(input.substr(8));
+            if (id != -1) {
+                std::cout << "> Created connection with id " << id << std::endl;
+            }
+        } else if (input.substr(0,5) == "close") {
+            std::stringstream ss(input);
+            
+            std::string cmd;
+            int id;
+            int close_code = websocketpp::close::status::normal;
+            std::string reason = "";
+            
+            ss >> cmd >> id >> close_code;
+            std::getline(ss,reason);
+            
+            endpoint.close(id, close_code, reason);
+        }  else if (input.substr(0,4) == "show") {
+            int id = atoi(input.substr(5).c_str());
+
+            connection_metadata::ptr metadata = endpoint.get_metadata(id);
+            if (metadata) {
+                std::cout << *metadata << std::endl;
+            } else {
+                std::cout << "> Unknown connection id " << id << std::endl;
+            }
+        } else {
+            std::cout << "> Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
 }

readme.md

@@ -1,4 +1,4 @@
-WebSocket++ (0.3.x branch)
+WebSocket++ (0.3.0-alpha4)
 ==========================
 
 WebSocket++ is a header only C++ library that implements RFC6455 The WebSocket
@@ -6,18 +6,6 @@ Protocol. It allows integrating WebSocket client and server functionality into
 C++ programs. It uses interchangeable network transport modules including one
 based on C++ iostreams and one based on Boost Asio.
 
-*This branch is no longer "experimental". It represents the current edge release
-of the WebSocket++ library. The API of 0.3.x has some significant changes from
-0.2.x, so care should be taken when upgrading.*
-
-*This branch's API is relatively stable now. Features implemented so far are 
-unlikely to change (except where explicitly noted). New features will be added
-regularly until parity with the 0.2 branch is reached.*
-
-*This is the preferred branch for new projects, especially those that involve 
-multithreaded servers. It is better tested and documented. The 0.3.x API will 
-be the basis for the 1.0 release.*
-
 Major Features
 ==============
 * Full support for RFC6455
@@ -26,29 +14,30 @@ Major Features
 * Supports secure WebSockets (TLS), IPv6, and explicit proxies.
 * Flexible dependency management (C++11 Standard Library or Boost)
 * Interchangeable network transport modules (iostream and Boost Asio)
-* Portable, cross platform and architecture design
+* Portable/cross platform (Posix/Windows, 32/64bit, Intel/ARM/PPC)
+* Thread-safe
 
 Get Involved
 ============
 
 [![Build Status](https://travis-ci.org/zaphoyd/websocketpp.png)](https://travis-ci.org/zaphoyd/websocketpp)
 
-**Project Website**  
+**Project Website**
 http://www.zaphoyd.com/websocketpp/
 
-**User Manual**  
+**User Manual**
 http://www.zaphoyd.com/websocketpp/manual/
 
-**GitHub Repository**  
+**GitHub Repository**
 https://github.com/zaphoyd/websocketpp/
 
-**Announcements Mailing List**  
+**Announcements Mailing List**
 http://groups.google.com/group/websocketpp-announcements/
 
-**IRC Channel**  
-#websocketpp (freenode)
+**IRC Channel**
+ #websocketpp (freenode)
 
-**Discussion / Development / Support Mailing List / Forum**  
+**Discussion / Development / Support Mailing List / Forum**
 http://groups.google.com/group/websocketpp/
 
 Author

roadmap.md

@@ -8,38 +8,37 @@ Complete & Tested:
 - GCC support
 - 64 bit support
 - 32 bit support
-
-Implimented, needs more testing
-- TLS support
-- echo_server & echo_server_tls
-- External io_service support
-- socket_init_handler
-- tls_init_handler
+- Logging
+- Client role
 - message_handler
 - ping_handler
 - pong_handler
+- open_handler
+- close_handler
+- echo_server & echo_server_tls
+
+Implemented, needs more testing
+- TLS support
+- External io_service support
+- socket_init_handler
+- tls_init_handler
 - tcp_init_handler
 - exception/error handling
-- Logging
-- Client role
 - Subprotocol negotiation
 - Hybi 00/Hixie 76 legacy protocol support
 - Performance tuning
 - Outgoing Proxy Support
 - PowerPC support
 - Visual Studio / Windows support
+- Timeouts
+- CMake build/install support
 
-Implimented, API not finalized
-- open_handler
-- close_handler
 - validate_handler
 - http_handler
 
-Needs work:
-- Timeouts
-
-Non-release blocking feature roadmap
+Future feature roadmap
 - Extension support
 - permessage_compress extension
 - Message buffer pool
-- CMake build/install support
+- flow control
+- tutorials & documentation

test/connection/SConscript

@@ -10,7 +10,7 @@ Import('polyfill_libs')
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
 
-BOOST_LIBS = boostlibs(['unit_test_framework','regex','system'],env) + [platform_libs]
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
 
 objs = env.Object('connection_boost.o', ["connection.cpp"], LIBS = BOOST_LIBS)
 objs = env.Object('connection_tu2_boost.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS)

test/connection/connection.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE connection
@@ -30,15 +30,15 @@
 
 #include "connection_tu2.hpp"
 
-// NOTE: these tests currently test against hardcoded output values. I am not 
-// sure how problematic this will be. If issues arise like order of headers the 
+// NOTE: these tests currently test against hardcoded output values. I am not
+// sure how problematic this will be. If issues arise like order of headers the
 // output should be parsed by http::response and have values checked directly
 
 BOOST_AUTO_TEST_CASE( basic_http_request ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-    std::string output = "HTTP/1.1 500 Internal Server Error\r\nServer: " + 
+    std::string output = "HTTP/1.1 426 Upgrade Required\r\nServer: " +
 		                 std::string(websocketpp::user_agent)+"\r\n\r\n";
-	
+
 	std::string o2 = run_server_test(input);
 
     BOOST_CHECK(o2 == output);
@@ -46,15 +46,15 @@ BOOST_AUTO_TEST_CASE( basic_http_request ) {
 
 struct connection_extension {
     connection_extension() : extension_value(5) {}
-    
+
     int extension_method() {
         return extension_value;
     }
-    
+
     bool is_server() const {
         return false;
     }
-    
+
     int extension_value;
 };
 
@@ -72,17 +72,16 @@ struct stub_config : public websocketpp::config::core {
     typedef core::elog_type elog_type;
 
     typedef core::rng_type rng_type;
-    
+
     typedef core::transport_type transport_type;
-    
+
     typedef core::endpoint_base endpoint_base;
     typedef connection_extension connection_base;
 };
 
 struct connection_setup {
-    connection_setup(bool server) 
-      : c(server,"",alog,elog,rng) {}
-    
+    connection_setup(bool p_is_server) : c(p_is_server, "", alog, elog, rng) {}
+
     websocketpp::lib::error_code ec;
 	stub_config::alog_type alog;
     stub_config::elog_type elog;
@@ -98,21 +97,27 @@ void validate_func(server* s, websocketpp::connection_hdl hdl, message_ptr msg)
     s->send(hdl, msg->get_payload(), msg->get_opcode());
 }
 
+bool validate_set_ua(server* s, websocketpp::connection_hdl hdl) {
+    server::connection_ptr con = s->get_con_from_hdl(hdl);
+    con->replace_header("Server","foo");
+    return true;
+}
+
 void http_func(server* s, websocketpp::connection_hdl hdl) {
     server::connection_ptr con = s->get_con_from_hdl(hdl);
-    
+
     std::string res = con->get_resource();
-    
+
     con->set_body(res);
     con->set_status(websocketpp::http::status_code::ok);
 }
 
 BOOST_AUTO_TEST_CASE( connection_extensions ) {
     connection_setup env(true);
-    
+
     BOOST_CHECK( env.c.extension_value == 5 );
     BOOST_CHECK( env.c.extension_method() == 5 );
-    
+
     BOOST_CHECK( env.c.is_server() == true );
 }
 
@@ -121,10 +126,10 @@ BOOST_AUTO_TEST_CASE( basic_websocket_request ) {
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: ";
     output+=websocketpp::user_agent;
     output+="\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	server s;
 	s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
-	
+
     BOOST_CHECK(run_server_test(s,input) == output);
 }
 
@@ -133,28 +138,102 @@ BOOST_AUTO_TEST_CASE( http_request ) {
     std::string output = "HTTP/1.1 200 OK\r\nContent-Length: 8\r\nServer: ";
     output+=websocketpp::user_agent;
     output+="\r\n\r\n/foo/bar";
-	
+
 	server s;
 	s.set_http_handler(bind(&http_func,&s,::_1));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
 }
 
+BOOST_AUTO_TEST_CASE( request_no_server_header ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nUpgrade: websocket\r\n\r\n";
+
+	server s;
+	s.set_user_agent("");
+	s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+}
+
+BOOST_AUTO_TEST_CASE( request_no_server_header_override ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
+
+	server s;
+	s.set_user_agent("");
+	s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
+	s.set_validate_handler(bind(&validate_set_ua,&s,::_1));
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+}
+
+BOOST_AUTO_TEST_CASE( basic_client_websocket ) {
+    std::string uri = "ws://localhost";
+
+    //std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
+
+	std::string ref = "GET / HTTP/1.1\r\nConnection: Upgrade\r\nFoo: Bar\r\nHost: localhost\r\nSec-WebSocket-Key: AAAAAAAAAAAAAAAAAAAAAA==\r\nSec-WebSocket-Version: 13\r\nUpgrade: websocket\r\nUser-Agent: foo\r\n\r\n";
+
+	std::stringstream output;
+
+	client e;
+	e.set_access_channels(websocketpp::log::alevel::none);
+    e.set_error_channels(websocketpp::log::elevel::none);
+	e.set_user_agent("foo");
+	e.register_ostream(&output);
+
+	client::connection_ptr con;
+	websocketpp::lib::error_code ec;
+	con = e.get_connection(uri, ec);
+	con->append_header("Foo","Bar");
+	e.connect(con);
+
+    BOOST_CHECK_EQUAL(ref, output.str());
+}
+
+BOOST_AUTO_TEST_CASE( set_max_message_size ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
+    
+    // After the handshake, add a single frame with a message that is too long.
+    char frame0[10] = {char(0x82), char(0x83), 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01};
+    input.append(frame0, 10);
+    
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
+
+    // After the handshake, add a single frame with a close message with message too big
+    // error code.
+    char frame1[4] = {char(0x88), 0x19, 0x03, char(0xf1)};
+    output.append(frame1, 4);
+    output.append("A message was too large");
+
+	server s;
+	s.set_user_agent("");
+	s.set_validate_handler(bind(&validate_set_ua,&s,::_1));
+    s.set_max_message_size(2);
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+}
+
+// TODO: set max message size in client endpoint test case
+// TODO: set max message size mid connection test case
+// TODO: [maybe] set max message size in open handler
+
 /*
 
 BOOST_AUTO_TEST_CASE( user_reject_origin ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example2.com\r\n\r\n";
     std::string output = "HTTP/1.1 403 Forbidden\r\nServer: "+websocketpp::USER_AGENT+"\r\n\r\n";
-	    
+
     BOOST_CHECK(run_server_test(input) == output);
 }
 
 BOOST_AUTO_TEST_CASE( basic_text_message ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-    
+
 	unsigned char frames[8] = {0x82,0x82,0xFF,0xFF,0xFF,0xFF,0xD5,0xD5};
 	input.append(reinterpret_cast<char*>(frames),8);
-	
+
 	std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: "+websocketpp::USER_AGENT+"\r\nUpgrade: websocket\r\n\r\n**";
 
     BOOST_CHECK( run_server_test(input) == output);

test/connection/connection_tu2.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #include "connection_tu2.hpp"
@@ -36,22 +36,22 @@ std::string run_server_test(std::string input) {
     return run_server_test(test_server,input);
 }
 
-std::string run_server_test(server& s, std::string input) {
+std::string run_server_test(server & s, std::string input) {
     server::connection_ptr con;
     std::stringstream output;
-	
+
 	s.clear_access_channels(websocketpp::log::alevel::all);
     s.clear_error_channels(websocketpp::log::elevel::all);
-	
+
 	s.register_ostream(&output);
-	
+
 	con = s.get_connection();
 	con->start();
-	
+
 	std::stringstream channel;
-	
+
 	channel << input;
 	channel >> *con;
-	
+
 	return output.str();
-}
+}

test/connection/connection_tu2.hpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #include <iostream>
@@ -32,25 +32,19 @@
 // server, no TLS, no locks, iostream based transport
 #include <websocketpp/config/core.hpp>
 #include <websocketpp/server.hpp>
+#include <websocketpp/client.hpp>
 
 typedef websocketpp::server<websocketpp::config::core> server;
+/// NOTE: the "server" config is being used for the client here because we don't
+/// want to pull in the real RNG. A better way to do this might be a custom
+/// client config with the RNG explicitly stubbed out.
+typedef websocketpp::client<websocketpp::config::core> client;
 typedef websocketpp::config::core::message_type::ptr message_ptr;
 
 using websocketpp::lib::placeholders::_1;
 using websocketpp::lib::placeholders::_2;
 using websocketpp::lib::bind;
 
-/*class echo_handler : public server::handler {
-	bool validate(connection_ptr con) {
-		std::cout << "handler validate" << std::endl;
-		if (con->get_origin() != "http://www.example.com") {
-		    con->set_status(websocketpp::http::status_code::FORBIDDEN);
-		    return false;
-		}
-		return true;
-	}
-};*/
-
 void echo_func(server* s, websocketpp::connection_hdl hdl, message_ptr msg);
 std::string run_server_test(std::string input);
-std::string run_server_test(server & s,std::string input);
+std::string run_server_test(server & s, std::string input);

test/endpoint/SConscript

@@ -11,7 +11,7 @@ Import('tls_libs')
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
 
-BOOST_LIBS = boostlibs(['unit_test_framework','regex','system'],env) + [platform_libs] + [tls_libs]
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + [tls_libs]
 
 objs = env.Object('endpoint_boost.o', ["endpoint.cpp"], LIBS = BOOST_LIBS)
 prgs = env.Program('test_endpoint_boost', ["endpoint_boost.o"], LIBS = BOOST_LIBS)

test/endpoint/endpoint.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE endpoint
@@ -59,15 +59,15 @@ BOOST_AUTO_TEST_CASE( initialize_server_asio_external ) {
 
 struct endpoint_extension {
     endpoint_extension() : extension_value(5) {}
-    
+
     int extension_method() {
         return extension_value;
     }
-    
+
     bool is_server() const {
         return false;
     }
-    
+
     int extension_value;
 };
 
@@ -85,17 +85,17 @@ struct stub_config : public websocketpp::config::core {
     typedef core::elog_type elog_type;
 
     typedef core::rng_type rng_type;
-    
+
     typedef core::transport_type transport_type;
-    
+
     typedef endpoint_extension endpoint_base;
 };
 
 BOOST_AUTO_TEST_CASE( endpoint_extensions ) {
     websocketpp::server<stub_config> s;
-    
+
     BOOST_CHECK( s.extension_value == 5 );
     BOOST_CHECK( s.extension_method() == 5 );
-    
+
     BOOST_CHECK( s.is_server() == true );
 }

test/extension/SConscript

@@ -10,14 +10,18 @@ Import('polyfill_libs')
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
 
-BOOST_LIBS = boostlibs(['unit_test_framework','system','regex'],env) + [platform_libs]
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + ['z']
 
 objs = env.Object('extension_boost.o', ["extension.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('permessage_deflate_boost.o', ["permessage_deflate.cpp"], LIBS = BOOST_LIBS)
 prgs = env.Program('test_extension_boost', ["extension_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_permessage_deflate_boost', ["permessage_deflate_boost.o"], LIBS = BOOST_LIBS)
 
 if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
    objs += env_cpp11.Object('extension_stl.o', ["extension.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('permessage_deflate_stl.o', ["permessage_deflate.cpp"], LIBS = BOOST_LIBS_CPP11)
    prgs += env_cpp11.Program('test_extension_stl', ["extension_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_permessage_deflate_stl', ["permessage_deflate_stl.o"], LIBS = BOOST_LIBS_CPP11)
 
 Return('prgs')

test/extension/extension.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE extension

test/extension/permessage_deflate.cpp

@@ -0,0 +1,543 @@
+/*
+ * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE permessage_deflate
+#include <boost/test/unit_test.hpp>
+
+#include <websocketpp/error.hpp>
+
+#include <websocketpp/extensions/extension.hpp>
+#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
+#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
+
+#include <string>
+
+#include <websocketpp/utilities.hpp>
+#include <iostream>
+
+class config {};
+
+typedef websocketpp::extensions::permessage_deflate::enabled<config> enabled_type;
+typedef websocketpp::extensions::permessage_deflate::disabled<config> disabled_type;
+
+struct ext_vars {
+    enabled_type exts;
+    enabled_type extc;
+    websocketpp::lib::error_code ec;
+    websocketpp::err_str_pair esp;
+    websocketpp::http::attribute_list attr;
+};
+namespace pmde = websocketpp::extensions::permessage_deflate::error;
+namespace pmd_mode = websocketpp::extensions::permessage_deflate::mode;
+
+// Ensure the disabled extension behaves appropriately disabled
+
+BOOST_AUTO_TEST_CASE( disabled_is_disabled ) {
+    disabled_type exts;
+    BOOST_CHECK( !exts.is_implemented() );
+}
+
+BOOST_AUTO_TEST_CASE( disabled_is_off ) {
+    disabled_type exts;
+    BOOST_CHECK( !exts.is_enabled() );
+}
+
+// Ensure the enabled version actually works
+
+BOOST_AUTO_TEST_CASE( enabled_is_enabled ) {
+    ext_vars v;
+    BOOST_CHECK( v.exts.is_implemented() );
+    BOOST_CHECK( v.extc.is_implemented() );
+}
+
+
+BOOST_AUTO_TEST_CASE( enabled_starts_disabled ) {
+    ext_vars v;
+    BOOST_CHECK( !v.exts.is_enabled() );
+    BOOST_CHECK( !v.extc.is_enabled() );
+}
+
+BOOST_AUTO_TEST_CASE( negotiation_empty_attr ) {
+    ext_vars v;
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
+}
+
+BOOST_AUTO_TEST_CASE( negotiation_invalid_attr ) {
+    ext_vars v;
+    v.attr["foo"] = "bar";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( !v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attributes) );
+    BOOST_CHECK_EQUAL( v.esp.second, "");
+}
+
+// Negotiate s2c_no_context_takeover
+BOOST_AUTO_TEST_CASE( negotiate_s2c_no_context_takeover_invalid ) {
+    ext_vars v;
+    v.attr["s2c_no_context_takeover"] = "foo";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( !v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
+    BOOST_CHECK_EQUAL( v.esp.second, "");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_s2c_no_context_takeover ) {
+    ext_vars v;
+    v.attr["s2c_no_context_takeover"] = "";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_s2c_no_context_takeover_server_initiated ) {
+    ext_vars v;
+
+    v.exts.enable_s2c_no_context_takeover();
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover");
+}
+
+// Negotiate c2s_no_context_takeover
+BOOST_AUTO_TEST_CASE( negotiate_c2s_no_context_takeover_invalid ) {
+    ext_vars v;
+    v.attr["c2s_no_context_takeover"] = "foo";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( !v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
+    BOOST_CHECK_EQUAL( v.esp.second, "");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_c2s_no_context_takeover ) {
+    ext_vars v;
+    v.attr["c2s_no_context_takeover"] = "";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_c2s_no_context_takeover_server_initiated ) {
+    ext_vars v;
+
+    v.exts.enable_c2s_no_context_takeover();
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover");
+}
+
+
+// Negotiate s2c_max_window_bits
+BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_invalid ) {
+    ext_vars v;
+
+    std::vector<std::string> values;
+    values.push_back("");
+    values.push_back("foo");
+    values.push_back("7");
+    values.push_back("16");
+
+    std::vector<std::string>::const_iterator it;
+    for (it = values.begin(); it != values.end(); ++it) {
+        v.attr["s2c_max_window_bits"] = *it;
+
+        v.esp = v.exts.negotiate(v.attr);
+        BOOST_CHECK( !v.exts.is_enabled() );
+        BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
+        BOOST_CHECK_EQUAL( v.esp.second, "");
+    }
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_valid ) {
+    ext_vars v;
+    v.attr["s2c_max_window_bits"] = "8";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_max_window_bits=8");
+
+    v.attr["s2c_max_window_bits"] = "15";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
+}
+
+BOOST_AUTO_TEST_CASE( invalid_set_s2c_max_window_bits ) {
+    ext_vars v;
+
+    v.ec = v.exts.set_s2c_max_window_bits(7,pmd_mode::decline);
+    BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
+
+    v.ec = v.exts.set_s2c_max_window_bits(16,pmd_mode::decline);
+    BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_decline ) {
+    ext_vars v;
+    v.attr["s2c_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_s2c_max_window_bits(15,pmd_mode::decline);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_accept ) {
+    ext_vars v;
+    v.attr["s2c_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_s2c_max_window_bits(15,pmd_mode::accept);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_max_window_bits=8");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_largest ) {
+    ext_vars v;
+    v.attr["s2c_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_s2c_max_window_bits(15,pmd_mode::largest);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_max_window_bits=8");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_smallest ) {
+    ext_vars v;
+    v.attr["s2c_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_s2c_max_window_bits(15,pmd_mode::smallest);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_max_window_bits=8");
+}
+
+// Negotiate s2c_max_window_bits
+BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_invalid ) {
+    ext_vars v;
+
+    std::vector<std::string> values;
+    values.push_back("foo");
+    values.push_back("7");
+    values.push_back("16");
+
+    std::vector<std::string>::const_iterator it;
+    for (it = values.begin(); it != values.end(); ++it) {
+        v.attr["c2s_max_window_bits"] = *it;
+
+        v.esp = v.exts.negotiate(v.attr);
+        BOOST_CHECK( !v.exts.is_enabled() );
+        BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
+        BOOST_CHECK_EQUAL( v.esp.second, "");
+    }
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_valid ) {
+    ext_vars v;
+
+    v.attr["c2s_max_window_bits"] = "";
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
+
+    v.attr["c2s_max_window_bits"] = "8";
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_max_window_bits=8");
+
+    v.attr["c2s_max_window_bits"] = "15";
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
+}
+
+BOOST_AUTO_TEST_CASE( invalid_set_c2s_max_window_bits ) {
+    ext_vars v;
+
+    v.ec = v.exts.set_c2s_max_window_bits(7,pmd_mode::decline);
+    BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
+
+    v.ec = v.exts.set_c2s_max_window_bits(16,pmd_mode::decline);
+    BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_decline ) {
+    ext_vars v;
+    v.attr["c2s_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_c2s_max_window_bits(8,pmd_mode::decline);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_accept ) {
+    ext_vars v;
+    v.attr["c2s_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_c2s_max_window_bits(15,pmd_mode::accept);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_max_window_bits=8");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_largest ) {
+    ext_vars v;
+    v.attr["c2s_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_c2s_max_window_bits(15,pmd_mode::largest);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_max_window_bits=8");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_smallest ) {
+    ext_vars v;
+    v.attr["c2s_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_c2s_max_window_bits(15,pmd_mode::smallest);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_max_window_bits=8");
+}
+
+
+// Combinations with 2
+BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated1 ) {
+    ext_vars v;
+
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["c2s_no_context_takeover"] = "";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_no_context_takeover");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated2 ) {
+    ext_vars v;
+
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["s2c_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; s2c_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated3 ) {
+    ext_vars v;
+
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["c2s_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated4 ) {
+    ext_vars v;
+
+    v.attr["c2s_no_context_takeover"] = "";
+    v.attr["s2c_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover; s2c_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated5 ) {
+    ext_vars v;
+
+    v.attr["c2s_no_context_takeover"] = "";
+    v.attr["c2s_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover; c2s_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated6 ) {
+    ext_vars v;
+
+    v.attr["s2c_max_window_bits"] = "10";
+    v.attr["c2s_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_max_window_bits=10; c2s_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated1 ) {
+    ext_vars v;
+
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["c2s_no_context_takeover"] = "";
+    v.attr["s2c_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_no_context_takeover; s2c_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated2 ) {
+    ext_vars v;
+
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["c2s_no_context_takeover"] = "";
+    v.attr["c2s_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_no_context_takeover; c2s_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated3 ) {
+    ext_vars v;
+
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["s2c_max_window_bits"] = "10";
+    v.attr["c2s_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; s2c_max_window_bits=10; c2s_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated4 ) {
+    ext_vars v;
+
+    v.attr["c2s_no_context_takeover"] = "";
+    v.attr["s2c_max_window_bits"] = "10";
+    v.attr["c2s_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover; s2c_max_window_bits=10; c2s_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_four_client_initiated ) {
+    ext_vars v;
+
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["c2s_no_context_takeover"] = "";
+    v.attr["s2c_max_window_bits"] = "10";
+    v.attr["c2s_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_no_context_takeover; s2c_max_window_bits=10; c2s_max_window_bits=10");
+}
+
+// Compression
+/*
+BOOST_AUTO_TEST_CASE( compress_data ) {
+    ext_vars v;
+
+    std::string in = "Hello";
+    std::string out;
+    std::string in2;
+    std::string out2;
+
+    v.exts.init();
+
+    v.ec = v.exts.compress(in,out);
+
+    std::cout << "in : " << websocketpp::utility::to_hex(in) << std::endl;
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    std::cout << "out: " << websocketpp::utility::to_hex(out) << std::endl;
+
+    in2 = out;
+
+    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(in2.data()),in2.size(),out2);
+
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    std::cout << "out: " << websocketpp::utility::to_hex(out2) << std::endl;
+    BOOST_CHECK_EQUAL( out, out2 );
+}
+
+BOOST_AUTO_TEST_CASE( decompress_data ) {
+    ext_vars v;
+
+    uint8_t in[12] = {0xf2, 0x48, 0xcd, 0xc9, 0xc9, 0x07, 0x00, 0x00, 0x00, 0xff, 0xff};
+    std::string out;
+
+    v.exts.init();
+
+    v.ec = v.exts.decompress(in,12,out);
+
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    std::cout << "out: " << websocketpp::utility::to_hex(out) << std::endl;
+    BOOST_CHECK( false );
+}
+*/

test/http/SConscript

@@ -10,7 +10,7 @@ Import('polyfill_libs')
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
 
-BOOST_LIBS = boostlibs(['unit_test_framework','regex'],env) + [platform_libs]
+BOOST_LIBS = boostlibs(['unit_test_framework'],env) + [platform_libs]
 
 objs = env.Object('parser_boost.o', ["parser.cpp"], LIBS = BOOST_LIBS)
 prgs = env.Program('test_http_boost', ["parser_boost.o"], LIBS = BOOST_LIBS)

test/http/parser.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE http_parser
@@ -35,7 +35,7 @@
 
 BOOST_AUTO_TEST_CASE( is_token_char ) {
     // Valid characters
-    
+
     // misc
     BOOST_CHECK( websocketpp::http::is_token_char('!') );
     BOOST_CHECK( websocketpp::http::is_token_char('#') );
@@ -51,29 +51,29 @@ BOOST_AUTO_TEST_CASE( is_token_char ) {
     BOOST_CHECK( websocketpp::http::is_token_char('_') );
     BOOST_CHECK( websocketpp::http::is_token_char('`') );
     BOOST_CHECK( websocketpp::http::is_token_char('~') );
-    
+
     // numbers
     for (int i = 0x30; i < 0x3a; i++) {
     	BOOST_CHECK( websocketpp::http::is_token_char((unsigned char)(i)) );
     }
-    
+
     // upper
     for (int i = 0x41; i < 0x5b; i++) {
     	BOOST_CHECK( websocketpp::http::is_token_char((unsigned char)(i)) );
     }
-    
+
     // lower
     for (int i = 0x61; i < 0x7b; i++) {
     	BOOST_CHECK( websocketpp::http::is_token_char((unsigned char)(i)) );
     }
-    
+
     // invalid characters
-    
+
     // lower unprintable
     for (int i = 0; i < 33; i++) {
     	BOOST_CHECK( !websocketpp::http::is_token_char((unsigned char)(i)) );
     }
-    
+
     // misc
     BOOST_CHECK( !websocketpp::http::is_token_char('(') );
     BOOST_CHECK( !websocketpp::http::is_token_char(')') );
@@ -92,12 +92,12 @@ BOOST_AUTO_TEST_CASE( is_token_char ) {
     BOOST_CHECK( !websocketpp::http::is_token_char('=') );
     BOOST_CHECK( !websocketpp::http::is_token_char('{') );
     BOOST_CHECK( !websocketpp::http::is_token_char('}') );
-    
+
     // upper unprintable and out of ascii range
     for (int i = 127; i < 256; i++) {
     	BOOST_CHECK( !websocketpp::http::is_token_char((unsigned char)(i)) );
     }
-    
+
     // is not
     BOOST_CHECK( !websocketpp::http::is_not_token_char('!') );
     BOOST_CHECK( websocketpp::http::is_not_token_char('(') );
@@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE( extract_quoted_string ) {
     std::string d5 = "foo";
 
     std::pair<std::string,std::string::const_iterator> ret;
-    
+
     using websocketpp::http::parser::extract_quoted_string;
 
     ret = extract_quoted_string(d1.begin(),d1.end());
@@ -158,7 +158,7 @@ BOOST_AUTO_TEST_CASE( extract_all_lws ) {
     std::string d1 = " foo     bar";
     d1.append(1,char(9));
     d1.append("baz\r\n d\r\n  \r\n  e\r\nf");
-    
+
     std::string::const_iterator ret;
 
     ret = websocketpp::http::parser::extract_all_lws(d1.begin(),d1.end());
@@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE( extract_all_lws ) {
 BOOST_AUTO_TEST_CASE( extract_attributes_blank ) {
     std::string s = "";
 
-    websocketpp::http::parser::attribute_list a;
+    websocketpp::http::attribute_list a;
     std::string::const_iterator it;
 
     it = websocketpp::http::parser::extract_attributes(s.begin(),s.end(),a);
@@ -197,7 +197,7 @@ BOOST_AUTO_TEST_CASE( extract_attributes_blank ) {
 BOOST_AUTO_TEST_CASE( extract_attributes_simple ) {
     std::string s = "foo";
 
-    websocketpp::http::parser::attribute_list a;
+    websocketpp::http::attribute_list a;
     std::string::const_iterator it;
 
     it = websocketpp::http::parser::extract_attributes(s.begin(),s.end(),a);
@@ -224,36 +224,36 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
 
 
     std::string sx = "foo;bar=\"a \\\"b\\\" c\"";
-    websocketpp::http::parser::parameter_list p;
-    websocketpp::http::parser::attribute_list a;
+    websocketpp::http::parameter_list p;
+    websocketpp::http::attribute_list a;
     std::string::const_iterator it;
-    
+
     using websocketpp::http::parser::extract_parameters;
 
     it = extract_parameters(s1.begin(),s1.end(),p);
     BOOST_CHECK( it == s1.begin() );
-    
+
     p.clear();
     it = extract_parameters(s2.begin(),s2.end(),p);
     BOOST_CHECK( it == s2.end() );
     BOOST_CHECK_EQUAL( p.size(), 1 );
     BOOST_CHECK( p[0].first == "foo" );
     BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
-    
+
     p.clear();
     it = extract_parameters(s3.begin(),s3.end(),p);
     BOOST_CHECK( it == s3.begin()+5 );
     BOOST_CHECK_EQUAL( p.size(), 1 );
     BOOST_CHECK( p[0].first == "foo" );
     BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
-    
+
     p.clear();
     it = extract_parameters(s4.begin(),s4.end(),p);
     BOOST_CHECK( it == s4.end() );
     BOOST_CHECK_EQUAL( p.size(), 1 );
     BOOST_CHECK( p[0].first == "foo" );
     BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
-    
+
     p.clear();
     it = extract_parameters(s5.begin(),s5.end(),p);
     BOOST_CHECK( it == s5.end() );
@@ -262,7 +262,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
     BOOST_CHECK( p[1].first == "bar" );
     BOOST_CHECK_EQUAL( p[1].second.size(), 0 );
-    
+
     p.clear();
     it = extract_parameters(s6.begin(),s6.end(),p);
     BOOST_CHECK( it == s6.end() );
@@ -272,7 +272,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.size(), 1 );
     BOOST_CHECK( a.find("bar") != a.end() );
     BOOST_CHECK_EQUAL( a.find("bar")->second, "" );
-    
+
     p.clear();
     it = extract_parameters(s7.begin(),s7.end(),p);
     BOOST_CHECK( it == s7.end() );
@@ -285,7 +285,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK( p[1].first == "bar" );
     a = p[1].second;
     BOOST_CHECK_EQUAL( a.size(), 0 );
-    
+
     p.clear();
     it = extract_parameters(s8.begin(),s8.end(),p);
     BOOST_CHECK( it == s8.end() );
@@ -297,7 +297,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.find("bar")->second, "" );
     BOOST_CHECK( a.find("baz") != a.end() );
     BOOST_CHECK_EQUAL( a.find("baz")->second, "" );
-    
+
     p.clear();
     it = extract_parameters(s9.begin(),s9.end(),p);
     BOOST_CHECK( it == s9.end() );
@@ -307,7 +307,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.size(), 1 );
     BOOST_CHECK( a.find("bar") != a.end() );
     BOOST_CHECK_EQUAL( a.find("bar")->second, "baz" );
-    
+
     p.clear();
     it = extract_parameters(s10.begin(),s10.end(),p);
     BOOST_CHECK( it == s10.end() );
@@ -319,7 +319,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.find("bar")->second, "baz" );
     BOOST_CHECK( a.find("boo") != a.end() );
     BOOST_CHECK_EQUAL( a.find("boo")->second, "" );
-    
+
     p.clear();
     it = extract_parameters(s11.begin(),s11.end(),p);
     BOOST_CHECK( it == s11.end() );
@@ -333,7 +333,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.find("boo")->second, "" );
     a = p[1].second;
     BOOST_CHECK_EQUAL( a.size(), 0 );
-    
+
     p.clear();
     it = extract_parameters(s12.begin(),s12.end(),p);
     BOOST_CHECK( it == s12.end() );
@@ -343,7 +343,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.size(), 1 );
     BOOST_CHECK( a.find("bar") != a.end() );
     BOOST_CHECK_EQUAL( a.find("bar")->second, "a b c" );
-    
+
     p.clear();
     it = extract_parameters(s13.begin(),s13.end(),p);
     BOOST_CHECK( it == s13.end() );
@@ -355,73 +355,121 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.find("bar")->second, "a \"b\" c" );
 }
 
+BOOST_AUTO_TEST_CASE( strip_lws ) {
+    std::string test1 = "foo";
+    std::string test2 = " foo ";
+    std::string test3 = "foo ";
+    std::string test4 = " foo";
+    std::string test5 = "    foo     ";
+    std::string test6 = "  \r\n  foo     ";
+    std::string test7 = "  \t  foo     ";
+    std::string test8 = "  \t       ";
+
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test1), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test2), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test3), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test4), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test5), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test6), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test7), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test8), "" );
+}
+
+BOOST_AUTO_TEST_CASE( case_insensitive_headers ) {
+    websocketpp::http::parser::parser r;
+
+    r.replace_header("foo","bar");
+
+    BOOST_CHECK_EQUAL( r.get_header("foo"), "bar" );
+    BOOST_CHECK_EQUAL( r.get_header("FOO"), "bar" );
+    BOOST_CHECK_EQUAL( r.get_header("Foo"), "bar" );
+}
+
+BOOST_AUTO_TEST_CASE( case_insensitive_headers_overwrite ) {
+    websocketpp::http::parser::parser r;
+
+    r.replace_header("foo","bar");
+
+    BOOST_CHECK_EQUAL( r.get_header("foo"), "bar" );
+    BOOST_CHECK_EQUAL( r.get_header("Foo"), "bar" );
+
+    r.replace_header("Foo","baz");
+
+    BOOST_CHECK_EQUAL( r.get_header("foo"), "baz" );
+    BOOST_CHECK_EQUAL( r.get_header("Foo"), "baz" );
+
+    r.remove_header("FoO");
+
+    BOOST_CHECK_EQUAL( r.get_header("foo"), "" );
+    BOOST_CHECK_EQUAL( r.get_header("Foo"), "" );
+}
 
 BOOST_AUTO_TEST_CASE( blank_consume ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "";
-    
+
     bool exception = false;
-    
+
     try {
     	r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( r.ready() == false );
 }
 
 BOOST_AUTO_TEST_CASE( blank_request ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "\r\n\r\n";
-    
+
     bool exception = false;
-    
+
     try {
     	r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == true );
     BOOST_CHECK( r.ready() == false );
 }
 
 BOOST_AUTO_TEST_CASE( bad_request_no_host ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\n\r\n";
-    
+
     bool exception = false;
-    
+
     try {
     	r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == true );
     BOOST_CHECK( r.ready() == false );
 }
 
 BOOST_AUTO_TEST_CASE( basic_request ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (std::exception &e) {
     	exception = true;
     	std::cout << e.what() << std::endl;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 41 );
     BOOST_CHECK( r.ready() == true );
@@ -433,18 +481,18 @@ BOOST_AUTO_TEST_CASE( basic_request ) {
 
 BOOST_AUTO_TEST_CASE( trailing_body_characters ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\na";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 41 );
     BOOST_CHECK( r.ready() == true );
@@ -456,13 +504,13 @@ BOOST_AUTO_TEST_CASE( trailing_body_characters ) {
 
 BOOST_AUTO_TEST_CASE( basic_split1 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\n";
     std::string raw2 = "Host: www.example.com\r\n\r\na";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     	pos += r.consume(raw2.c_str(),raw2.size());
@@ -470,7 +518,7 @@ BOOST_AUTO_TEST_CASE( basic_split1 ) {
     	exception = true;
     	std::cout << e.what() << std::endl;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 41 );
     BOOST_CHECK( r.ready() == true );
@@ -482,13 +530,13 @@ BOOST_AUTO_TEST_CASE( basic_split1 ) {
 
 BOOST_AUTO_TEST_CASE( basic_split2 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r";
     std::string raw2 = "\n\r\na";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     	pos += r.consume(raw2.c_str(),raw2.size());
@@ -496,7 +544,7 @@ BOOST_AUTO_TEST_CASE( basic_split2 ) {
     	exception = true;
     	std::cout << e.what() << std::endl;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 41 );
     BOOST_CHECK( r.ready() == true );
@@ -508,12 +556,12 @@ BOOST_AUTO_TEST_CASE( basic_split2 ) {
 
 BOOST_AUTO_TEST_CASE( max_header_len ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw(websocketpp::http::max_header_size+1,'*');
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     } catch (const websocketpp::http::exception& e) {
@@ -521,19 +569,19 @@ BOOST_AUTO_TEST_CASE( max_header_len ) {
     		exception = true;
     	}
     }
-    
+
     BOOST_CHECK( exception == true );
 }
 
 BOOST_AUTO_TEST_CASE( max_header_len_split ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw(websocketpp::http::max_header_size-1,'*');
     std::string raw2(2,'*');
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     	pos += r.consume(raw2.c_str(),raw2.size());
@@ -542,24 +590,24 @@ BOOST_AUTO_TEST_CASE( max_header_len_split ) {
     		exception = true;
     	}
     }
-    
+
     BOOST_CHECK( exception == true );
 }
 
 BOOST_AUTO_TEST_CASE( firefox_full_request ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost: localhost:5000\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\nAccept-Language: en-us,en;q=0.5\r\nAccept-Encoding: gzip, deflate\r\nConnection: keep-alive, Upgrade\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Origin: http://zaphoyd.com\r\nSec-WebSocket-Key: pFik//FxwFk0riN4ZiPFjQ==\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 482 );
     BOOST_CHECK( r.ready() == true );
@@ -582,270 +630,297 @@ BOOST_AUTO_TEST_CASE( firefox_full_request ) {
 
 BOOST_AUTO_TEST_CASE( bad_method ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GE]T / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
-    
+
     try {
     	r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == true );
 }
 
 BOOST_AUTO_TEST_CASE( bad_header_name ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHo]st: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
-    
+
     try {
     	r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == true );
 }
 
 BOOST_AUTO_TEST_CASE( old_http_version ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.0\r\nHost: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 41 );
+    BOOST_CHECK_EQUAL( pos, 41 );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.0" );
-    BOOST_CHECK( r.get_method() == "GET" );
-    BOOST_CHECK( r.get_uri() == "/" );
-    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.0" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
 }
 
 BOOST_AUTO_TEST_CASE( new_http_version1 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.12\r\nHost: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 42 );
+    BOOST_CHECK_EQUAL( pos, 42 );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.12" );
-    BOOST_CHECK( r.get_method() == "GET" );
-    BOOST_CHECK( r.get_uri() == "/" );
-    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.12" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
 }
 
 BOOST_AUTO_TEST_CASE( new_http_version2 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/12.12\r\nHost: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 43 );
+    BOOST_CHECK_EQUAL( pos, 43 );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/12.12" );
-    BOOST_CHECK( r.get_method() == "GET" );
-    BOOST_CHECK( r.get_uri() == "/" );
-    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/12.12" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
 }
 
 /* commented out due to not being implemented yet
 
 BOOST_AUTO_TEST_CASE( new_http_version3 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTPS/12.12\r\nHost: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == true );
-}
+}*/
 
 BOOST_AUTO_TEST_CASE( header_whitespace1 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost:  www.example.com \r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 43 );
+    BOOST_CHECK_EQUAL( pos, 43 );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
-    BOOST_CHECK( r.get_method() == "GET" );
-    BOOST_CHECK( r.get_uri() == "/" );
-    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
 }
 
 BOOST_AUTO_TEST_CASE( header_whitespace2 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost:www.example.com\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 40 );
+    BOOST_CHECK_EQUAL( pos, 40 );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
-    BOOST_CHECK( r.get_method() == "GET" );
-    BOOST_CHECK( r.get_uri() == "/" );
-    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
-}*/
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
+}
 
 BOOST_AUTO_TEST_CASE( header_aggregation ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\nFoo: bar\r\nFoo: bat\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 61 );
+    BOOST_CHECK_EQUAL( pos, 61 );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
-    BOOST_CHECK( r.get_method() == "GET" );
-    BOOST_CHECK( r.get_uri() == "/" );
-    BOOST_CHECK( r.get_header("Foo") == "bar, bat" );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Foo"), "bar, bat" );
 }
 
 BOOST_AUTO_TEST_CASE( wikipedia_example_response ) {
     websocketpp::http::parser::response r;
-    
+
     std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     } catch (std::exception &e) {
     	exception = true;
     	std::cout << e.what() << std::endl;
     }
-    
+
     BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 159 );
+    BOOST_CHECK_EQUAL( pos, 159 );
     BOOST_CHECK( r.headers_ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
-    BOOST_CHECK( r.get_status_code() == websocketpp::http::status_code::switching_protocols );
-    BOOST_CHECK( r.get_status_msg() == "Switching Protocols" );
-    BOOST_CHECK( r.get_header("Upgrade") == "websocket" );
-    BOOST_CHECK( r.get_header("Connection") == "Upgrade" );
-    BOOST_CHECK( r.get_header("Sec-WebSocket-Accept") == "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
-    BOOST_CHECK( r.get_header("Sec-WebSocket-Protocol") == "chat" );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
+    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
+    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
+    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
+}
+
+BOOST_AUTO_TEST_CASE( response_with_non_standard_lws ) {
+    websocketpp::http::parser::response r;
+
+    std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept:HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+    	pos += r.consume(raw.c_str(),raw.size());
+    } catch (std::exception &e) {
+    	exception = true;
+    	std::cout << e.what() << std::endl;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 158 );
+    BOOST_CHECK( r.headers_ready() );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
+    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
+    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
+    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
 }
 
 BOOST_AUTO_TEST_CASE( plain_http_response ) {
     websocketpp::http::parser::response r;
-    
+
     std::string raw = "HTTP/1.1 200 OK\r\nDate: Thu, 10 May 2012 11:59:25 GMT\r\nServer: Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch\r\nLast-Modified: Tue, 30 Mar 2010 17:41:28 GMT\r\nETag: \"16799d-55-4830823a78200\"\r\nAccept-Ranges: bytes\r\nContent-Length: 85\r\nVary: Accept-Encoding\r\nContent-Type: text/html\r\n\r\n<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     } catch (std::exception &e) {
     	exception = true;
     	std::cout << e.what() << std::endl;
     }
-    
+
     BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 405 );
+    BOOST_CHECK_EQUAL( pos, 405 );
     BOOST_CHECK( r.headers_ready() == true );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
-    BOOST_CHECK( r.get_status_code() == websocketpp::http::status_code::ok );
-    BOOST_CHECK( r.get_status_msg() == "OK" );
-    BOOST_CHECK( r.get_header("Date") == "Thu, 10 May 2012 11:59:25 GMT" );
-    BOOST_CHECK( r.get_header("Server") == "Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch" );
-    BOOST_CHECK( r.get_header("Last-Modified") == "Tue, 30 Mar 2010 17:41:28 GMT" );
-    BOOST_CHECK( r.get_header("ETag") == "\"16799d-55-4830823a78200\"" );
-    BOOST_CHECK( r.get_header("Accept-Ranges") == "bytes" );
-    BOOST_CHECK( r.get_header("Content-Length") == "85" );
-    BOOST_CHECK( r.get_header("Vary") == "Accept-Encoding" );
-    BOOST_CHECK( r.get_header("Content-Type") == "text/html" );
-    BOOST_CHECK( r.get_body() == "<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>" );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::ok );
+    BOOST_CHECK_EQUAL( r.get_status_msg(), "OK" );
+    BOOST_CHECK_EQUAL( r.get_header("Date"), "Thu, 10 May 2012 11:59:25 GMT" );
+    BOOST_CHECK_EQUAL( r.get_header("Server"), "Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch" );
+    BOOST_CHECK_EQUAL( r.get_header("Last-Modified"), "Tue, 30 Mar 2010 17:41:28 GMT" );
+    BOOST_CHECK_EQUAL( r.get_header("ETag"), "\"16799d-55-4830823a78200\"" );
+    BOOST_CHECK_EQUAL( r.get_header("Accept-Ranges"), "bytes" );
+    BOOST_CHECK_EQUAL( r.get_header("Content-Length"), "85" );
+    BOOST_CHECK_EQUAL( r.get_header("Vary"), "Accept-Encoding" );
+    BOOST_CHECK_EQUAL( r.get_header("Content-Type"), "text/html" );
+    BOOST_CHECK_EQUAL( r.get_body(), "<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>" );
 }
 
 BOOST_AUTO_TEST_CASE( parse_istream ) {
     websocketpp::http::parser::response r;
-    
+
     std::stringstream s;
-    
+
     s << "HTTP/1.1 200 OK\r\nDate: Thu, 10 May 2012 11:59:25 GMT\r\nServer: Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch\r\nLast-Modified: Tue, 30 Mar 2010 17:41:28 GMT\r\nETag: \"16799d-55-4830823a78200\"\r\nAccept-Ranges: bytes\r\nContent-Length: 85\r\nVary: Accept-Encoding\r\nContent-Type: text/html\r\n\r\n<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(s);
     } catch (std::exception &e) {
     	exception = true;
     	std::cout << e.what() << std::endl;
     }
-    
+
     BOOST_CHECK_EQUAL( exception, false );
     BOOST_CHECK_EQUAL( pos, 405 );
     BOOST_CHECK_EQUAL( r.headers_ready(), true );
@@ -854,40 +929,40 @@ BOOST_AUTO_TEST_CASE( parse_istream ) {
 
 BOOST_AUTO_TEST_CASE( write_request_basic ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\n\r\n";
-    
+
     r.set_version("HTTP/1.1");
     r.set_method("GET");
     r.set_uri("/");
-    
-    BOOST_CHECK( r.raw() == raw );
+
+    BOOST_CHECK_EQUAL( r.raw(), raw );
 }
 
 BOOST_AUTO_TEST_CASE( write_request_with_header ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost: http://example.com\r\n\r\n";
-    
+
     r.set_version("HTTP/1.1");
     r.set_method("GET");
     r.set_uri("/");
     r.replace_header("Host","http://example.com");
-    
-    BOOST_CHECK( r.raw() == raw );
+
+    BOOST_CHECK_EQUAL( r.raw(), raw );
 }
 
 BOOST_AUTO_TEST_CASE( write_request_with_body ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "POST / HTTP/1.1\r\nContent-Length: 48\r\nContent-Type: application/x-www-form-urlencoded\r\nHost: http://example.com\r\n\r\nlicenseID=string&content=string&paramsXML=string";
-    
+
     r.set_version("HTTP/1.1");
     r.set_method("POST");
     r.set_uri("/");
     r.replace_header("Host","http://example.com");
     r.replace_header("Content-Type","application/x-www-form-urlencoded");
     r.set_body("licenseID=string&content=string&paramsXML=string");
-    
-    BOOST_CHECK( r.raw() == raw );
+
+    BOOST_CHECK_EQUAL( r.raw(), raw );
 }

test/http/parser_perf.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #include <websocketpp/http/parser.hpp>
@@ -36,18 +36,18 @@ public:
 	}
 	~scoped_timer() {
 		std::chrono::nanoseconds time_taken = std::chrono::steady_clock::now()-m_start;
-		
+
 		//nanoseconds_per_test
-		
+
 		//tests_per_second
-		
+
 		//1000000000.0/(double(time_taken.count())/1000.0)
-		
+
 		std::cout << 1000000000.0/(double(time_taken.count())/1000.0) << std::endl;
-		
+
 		//std::cout << (1.0/double(time_taken.count())) * double(1000000000*1000) << std::endl;
 	}
-	
+
 private:
 	std::string m_id;
 	std::chrono::steady_clock::time_point m_start;
@@ -55,87 +55,87 @@ private:
 
 int main() {
 	std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-	
+
 	std::string firefox = "GET / HTTP/1.1\r\nHost: localhost:5000\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\nAccept-Language: en-us,en;q=0.5\r\nAccept-Encoding: gzip, deflate\r\nConnection: keep-alive, Upgrade\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Origin: http://zaphoyd.com\r\nSec-WebSocket-Key: pFik//FxwFk0riN4ZiPFjQ==\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	std::string firefox1 = "GET / HTTP/1.1\r\nHost: localhost:5000\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\nAccept-Language: en-us,en;q=0.5\r\n";
-	
+
 	std::string firefox2 = "Accept-Encoding: gzip, deflate\r\nConnection: keep-alive, Upgrade\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Origin: http://zaphoyd.com\r\nSec-WebSocket-Key: pFik//FxwFk0riN4ZiPFjQ==\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\n\r\n";
-	
-	{	
+
+	{
 		scoped_timer timer("Simplest 1 chop");
 		for (int i = 0; i < 1000; i++) {
 			websocketpp::http::parser::request r;
-			
+
 			try {
 				r.consume(raw.c_str(),raw.size());
 			} catch (...) {
 				std::cout << "exception" << std::endl;
 			}
-			
+
 			if (!r.ready()) {
 				std::cout << "error" << std::endl;
 				break;
 			}
 		}
 	}
-	
-	{	
+
+	{
 		scoped_timer timer("FireFox, 1 chop, consume old");
 		for (int i = 0; i < 1000; i++) {
 			websocketpp::http::parser::request r;
-			
+
 			try {
 				r.consume2(firefox.c_str(),firefox.size());
 			} catch (...) {
 				std::cout << "exception" << std::endl;
 			}
-			
+
 			if (!r.ready()) {
 				std::cout << "error" << std::endl;
 				break;
 			}
 		}
 	}
-	
-	{	
+
+	{
 		scoped_timer timer("FireFox, 1 chop");
 		for (int i = 0; i < 1000; i++) {
 			websocketpp::http::parser::request r;
-			
+
 			try {
 				r.consume(firefox.c_str(),firefox.size());
 			} catch (...) {
 				std::cout << "exception" << std::endl;
 			}
-			
+
 			if (!r.ready()) {
 				std::cout << "error" << std::endl;
 				break;
 			}
 		}
 	}
-	
-	
-	
-	{	
+
+
+
+	{
 		scoped_timer timer("FireFox, 2 chop");
 		for (int i = 0; i < 1000; i++) {
 			websocketpp::http::parser::request r;
-			
+
 			try {
 				r.consume(firefox1.c_str(),firefox1.size());
 				r.consume(firefox2.c_str(),firefox2.size());
 			} catch (...) {
 				std::cout << "exception" << std::endl;
 			}
-			
+
 			if (!r.ready()) {
 				std::cout << "error" << std::endl;
 				break;
 			}
 		}
 	}
-	
+
 	return 0;
 }

test/logger/SConscript

@@ -10,7 +10,7 @@ Import('polyfill_libs')
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
 
-BOOST_LIBS = boostlibs(['unit_test_framework','regex','system'],env) + [platform_libs]
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
 
 objs = env.Object('logger_basic_boost.o', ["basic.cpp"], LIBS = BOOST_LIBS)
 prgs = env.Program('logger_basic_boost', ["logger_basic_boost.o"], LIBS = BOOST_LIBS)

test/logger/basic.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE basic_log
@@ -36,16 +36,16 @@
 
 BOOST_AUTO_TEST_CASE( is_token_char ) {
     typedef websocketpp::log::basic<websocketpp::concurrency::none,websocketpp::log::elevel> error_log;
-    
+
     error_log elog;
-    
+
     BOOST_CHECK( elog.static_test(websocketpp::log::elevel::info ) == true );
     BOOST_CHECK( elog.static_test(websocketpp::log::elevel::warn ) == true );
     BOOST_CHECK( elog.static_test(websocketpp::log::elevel::rerror ) == true );
     BOOST_CHECK( elog.static_test(websocketpp::log::elevel::fatal ) == true );
-    
+
     elog.set_channels(websocketpp::log::elevel::info);
-    
+
     elog.write(websocketpp::log::elevel::info,"Information");
     elog.write(websocketpp::log::elevel::warn,"A warning");
     elog.write(websocketpp::log::elevel::rerror,"A error");
@@ -54,13 +54,13 @@ BOOST_AUTO_TEST_CASE( is_token_char ) {
 
 BOOST_AUTO_TEST_CASE( access_clear ) {
     typedef websocketpp::log::basic<websocketpp::concurrency::none,websocketpp::log::alevel> access_log;
-    
+
     std::stringstream out;
     access_log logger(0xffffffff,&out);
-    
+
     // clear all channels
     logger.clear_channels(0xffffffff);
-    
+
     // writes shouldn't happen
     logger.write(websocketpp::log::alevel::devel,"devel");
     //std::cout << "|" << out.str() << "|" << std::endl;
@@ -69,13 +69,13 @@ BOOST_AUTO_TEST_CASE( access_clear ) {
 
 BOOST_AUTO_TEST_CASE( basic_concurrency ) {
     typedef websocketpp::log::basic<websocketpp::concurrency::basic,websocketpp::log::alevel> access_log;
-    
+
     std::stringstream out;
     access_log logger(0xffffffff,&out);
-    
+
     logger.set_channels(0xffffffff);
-        
+
     logger.write(websocketpp::log::alevel::devel,"devel");
     //std::cout << "|" << out.str() << "|" << std::endl;
     BOOST_CHECK( out.str().size() > 0 );
-}
+}

test/message_buffer/alloc.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE message_buffer_alloc
@@ -36,7 +36,7 @@
 template <template <class> class con_msg_manager>
 struct stub {
 	typedef websocketpp::lib::shared_ptr<stub> ptr;
-	
+
 	typedef con_msg_manager<stub> con_msg_man_type;
 	typedef typename con_msg_man_type::ptr con_msg_man_ptr;
 	typedef typename con_msg_man_type::weak_ptr con_msg_man_weak_ptr;
@@ -55,16 +55,16 @@ struct stub {
 			return false;
 		}
 	}
-	
+
 	websocketpp::frame::opcode::value	m_opcode;
 	con_msg_man_weak_ptr	            m_manager;
 	size_t					            m_size;
 };
 
 BOOST_AUTO_TEST_CASE( basic_get_message ) {
-	typedef stub<websocketpp::message_buffer::alloc::con_msg_manager> 
+	typedef stub<websocketpp::message_buffer::alloc::con_msg_manager>
 		message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_man_type;
 
 	con_msg_man_type::ptr manager(new con_msg_man_type());
@@ -77,13 +77,13 @@ BOOST_AUTO_TEST_CASE( basic_get_message ) {
 }
 
 BOOST_AUTO_TEST_CASE( basic_get_manager ) {
-	typedef stub<websocketpp::message_buffer::alloc::con_msg_manager> 
+	typedef stub<websocketpp::message_buffer::alloc::con_msg_manager>
 		message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_man_type;
 	typedef websocketpp::message_buffer::alloc::endpoint_msg_manager
 		<con_msg_man_type> endpoint_manager_type;
-	
+
 	endpoint_manager_type em;
 	con_msg_man_type::ptr manager = em.get_manager();
 	message_type::ptr msg = manager->get_message(websocketpp::frame::opcode::TEXT,512);

test/message_buffer/message.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE message
@@ -37,7 +37,7 @@ template <typename message>
 struct stub {
 	typedef websocketpp::lib::weak_ptr<stub> weak_ptr;
 	typedef websocketpp::lib::shared_ptr<stub> ptr;
-	
+
 	stub() : recycled(false) {}
 
 	bool recycle(message * msg) {
@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE( basic_size_check ) {
 
 	stub_type::ptr s(new stub_type());
 	message_type::ptr msg(new message_type(s,websocketpp::frame::opcode::TEXT,500));
-	
+
 	BOOST_CHECK(msg->get_payload().capacity() >= 500);
 }
 

test/message_buffer/pool.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE hybi_00_processor
@@ -40,37 +40,37 @@ BOOST_AUTO_TEST_CASE( exact_match ) {
     websocketpp::http::parser::request r;
     websocketpp::http::parser::response response;
     websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nOrigin: http://example.com\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
     r.replace_header("Sec-WebSocket-Key3","WjN}|M(6");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     BOOST_CHECK(p.validate_handshake(r));
-    
+
     websocketpp::uri_ptr u;
     bool exception;
-    
+
     try {
     	u = p.get_uri(r);
     } catch (const websocketpp::uri_exception& e) {
     	exception = true;
     }
-    
+
     BOOST_CHECK(exception == false);
     BOOST_CHECK(u->get_secure() == false);
     BOOST_CHECK(u->get_host() == "www.example.com");
     BOOST_CHECK(u->get_resource() == "/");
     BOOST_CHECK(u->get_port() == websocketpp::URI_DEFAULT_PORT);
-    
+
     p.process_handshake(r,response);
-    
+
     BOOST_CHECK(response.get_header("Connection") == "Upgrade");
     BOOST_CHECK(response.get_header("Upgrade") == "websocket");
     BOOST_CHECK(response.get_header("Sec-WebSocket-Origin") == "http://example.com");
-        
+
     BOOST_CHECK(response.get_header("Sec-WebSocket-Location") == "ws://www.example.com/");
     BOOST_CHECK(response.get_header("Sec-WebSocket-Key3") == "n`9eBk9z$R8pOtVb");
 }
@@ -78,12 +78,12 @@ BOOST_AUTO_TEST_CASE( exact_match ) {
 BOOST_AUTO_TEST_CASE( non_get_method ) {
     websocketpp::http::parser::request r;
     websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-    
+
     std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
     r.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     BOOST_CHECK(!p.validate_handshake(r));
@@ -92,12 +92,12 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
 BOOST_AUTO_TEST_CASE( old_http_version ) {
     websocketpp::http::parser::request r;
     websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-    
+
     std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
     r.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     BOOST_CHECK(!p.validate_handshake(r));
@@ -106,12 +106,12 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
     websocketpp::http::parser::request r;
     websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
     r.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     BOOST_CHECK(!p.validate_handshake(r));
@@ -120,12 +120,12 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
     websocketpp::http::parser::request r;
     websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
     r.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     BOOST_CHECK(!p.validate_handshake(r));
@@ -136,21 +136,21 @@ BOOST_AUTO_TEST_CASE( bad_host ) {
     websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
     websocketpp::uri_ptr u;
     bool exception = false;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
     r.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     BOOST_CHECK(!p.validate_handshake(r));
-    
+
     try {
     	u = p.get_uri(r);
     } catch (const websocketpp::uri_exception& e) {
     	exception = true;
     }
-    
+
     BOOST_CHECK(exception == true);
-}
+}

test/processors/SConscript

@@ -10,7 +10,7 @@ Import('polyfill_libs')
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
 
-BOOST_LIBS = boostlibs(['unit_test_framework','regex','system'],env) + [platform_libs]
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + ['z']
 
 objs = env.Object('test_processor_boost.o', ["processor.cpp"], LIBS = BOOST_LIBS)
 objs += env.Object('test_hybi13_boost.o', ["hybi13.cpp"], LIBS = BOOST_LIBS)
@@ -27,8 +27,8 @@ prgs += env.Program('test_hybi00_boost', ["test_hybi00_boost.o"], LIBS = BOOST_L
 prgs += env.Program('test_extension_permessage_compress_boost', ["test_extension_permessage_compress_boost.o"], LIBS = BOOST_LIBS + ['z'])
 
 if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   # no C++11 features are used in processor so there are no C++11 versions of 
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
+   # no C++11 features are used in processor so there are no C++11 versions of
    # these tests.
    objs += env_cpp11.Object('test_processor_stl.o', ["processor.cpp"], LIBS = BOOST_LIBS_CPP11)
    objs += env_cpp11.Object('test_hybi13_stl.o', ["hybi13.cpp"], LIBS = BOOST_LIBS_CPP11)
@@ -36,7 +36,7 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    objs += env_cpp11.Object('test_hybi07_stl.o', ["hybi07.cpp"], LIBS = BOOST_LIBS_CPP11)
    objs += env_cpp11.Object('test_hybi00_stl.o', ["hybi00.cpp"], LIBS = BOOST_LIBS_CPP11)
    objs += env_cpp11.Object('test_extension_permessage_compress_stl.o', ["extension_permessage_compress.cpp"], LIBS = BOOST_LIBS_CPP11 + ['z'])
-   
+
    prgs += env_cpp11.Program('test_processor_stl', ["test_processor_stl.o"], LIBS = BOOST_LIBS_CPP11)
    prgs += env_cpp11.Program('test_hybi13_stl', ["test_hybi13_stl.o"], LIBS = BOOST_LIBS_CPP11)
    prgs += env_cpp11.Program('test_hybi08_stl', ["test_hybi08_stl.o"], LIBS = BOOST_LIBS_CPP11)

test/processors/extension_permessage_compress.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE extension_permessage_deflate
@@ -38,7 +38,7 @@
 struct config {
     typedef websocketpp::http::parser::request request_type;
 };
-typedef websocketpp::extensions::permessage_deflate::enabled<config> 
+typedef websocketpp::extensions::permessage_deflate::enabled<config>
     compressor_type;
 
 using namespace websocketpp;
@@ -50,23 +50,23 @@ BOOST_AUTO_TEST_CASE( deflate_init ) {
 
     neg_ret = compressor.negotiate(attributes);
 
-    BOOST_CHECK_EQUAL( neg_ret.first, 
+    BOOST_CHECK_EQUAL( neg_ret.first,
         extensions::permessage_deflate::error::invalid_parameters );*/
-    
+
     /**
      * Window size is primarily controlled by the writer. A stream can only be
      * read by a window size equal to or greater than the one use to compress
-     * it initially. The default windows size is also the maximum window size. 
+     * it initially. The default windows size is also the maximum window size.
      * Thus:
      *
      * Outbound window size can be limited unilaterally under the assumption
      * that the opposite end will be using the default (maximum size which can
      * read anything)
      *
-     * Inbound window size must be limited by asking the remote endpoint to 
+     * Inbound window size must be limited by asking the remote endpoint to
      * do so and it agreeing.
-     * 
-     * Context takeover is also primarily controlled by the writer. If the 
+     *
+     * Context takeover is also primarily controlled by the writer. If the
      * compressor does not clear its context between messages then the reader
      * can't either.
      *
@@ -81,17 +81,17 @@ BOOST_AUTO_TEST_CASE( deflate_init ) {
      * - whether or not to request that the server disallow context takeover
      *
      * Server must answer in the following ways
-     * - If client requested a window size limit, is the window size limit 
+     * - If client requested a window size limit, is the window size limit
      *   acceptable?
      * - If client allows window limit requests, should we send one?
      * - If client requested no context takeover, should we accept?
-     * 
-     * 
-     * 
+     *
+     *
+     *
      * All Defaults
      * Req: permessage-compress; method=deflate
      * Ans: permessage-compress; method=deflate
-     * 
+     *
      * # Client wants to limit the size of inbound windows from server
      * permessage-compress; method="deflate; s2c_max_window_bits=8, deflate"
      * Ans: permessage-compress; method="deflate; s2c_max_window_bits=8"
@@ -99,13 +99,13 @@ BOOST_AUTO_TEST_CASE( deflate_init ) {
      * Ans: permessage-compress; method=deflate
      *
      * # Server wants to limit the size of inbound windows from client
-     * Client: 
+     * Client:
      * permessage-compress; method="deflate; c2s_max_window_bits, deflate"
-     * 
+     *
      * Server:
      * permessage-compress; method="deflate; c2s_max_window_bits=8"
-     * 
-     * # Client wants to 
+     *
+     * # Client wants to
      *
      *
      *
@@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE( deflate_init ) {
      *
      *
      */
-    
+
 
 
 
@@ -144,30 +144,30 @@ BOOST_AUTO_TEST_CASE( deflate_init ) {
     attributes.push_back(http::parser::attribute("s2c_max_window_bits","9"));
     ec = d.init(attributes);
     BOOST_CHECK( !ec);
-    
+
     attributes.clear();
     ec = d.init(attributes);
     BOOST_CHECK( !ec);
-    
+
     processor::extensions::deflate_engine de;
-    
+
     unsigned char test_in[] = "HelloHelloHelloHello";
     unsigned char test_out[30];
-    
+
     uLongf test_out_size = 30;
-    
+
     int ret;
 
-    ret = compress(test_out, &test_out_size, test_in, 20); 
-    
+    ret = compress(test_out, &test_out_size, test_in, 20);
+
     std::cout << ret << std::endl
               << websocketpp::utility::to_hex(test_in,20) << std::endl
               << websocketpp::utility::to_hex(test_out,test_out_size) << std::endl;
-        
+
     std::string input = "Hello";
     std::string output = "";
     ec = de.compress(input,output);
-    
+
     BOOST_CHECK( ec == processor::extensions::error::uninitialized );
 
     //std::cout << ec.message() << websocketpp::utility::to_hex(output) << std::endl;
@@ -180,7 +180,7 @@ BOOST_AUTO_TEST_CASE( deflate_init ) {
     std::cout << ec.message() << std::endl
               << websocketpp::utility::to_hex(input) << std::endl
               << websocketpp::utility::to_hex(output) << std::endl;
-    
+
     output = "";
 
     ec = de.compress(input,output);

test/processors/hybi00.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ * Copyright (c) 2013, Peter Thorson. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE hybi_00_processor
@@ -36,6 +36,7 @@
 #include <websocketpp/http/response.hpp>
 #include <websocketpp/message_buffer/message.hpp>
 #include <websocketpp/message_buffer/alloc.hpp>
+#include <websocketpp/logger/stub.hpp>
 
 struct stub_config {
 	typedef websocketpp::http::parser::request request_type;
@@ -43,15 +44,22 @@ struct stub_config {
 
 	typedef websocketpp::message_buffer::message
 		<websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_manager_type;
+	
+	typedef websocketpp::log::stub alog_type;
+	typedef websocketpp::log::stub elog_type;
+	
+	static const size_t max_message_size = 16000000;
+	
+	
 };
 
 struct processor_setup {
-    processor_setup(bool server) 
+    processor_setup(bool server)
       : msg_manager(new stub_config::con_msg_manager_type())
       , p(false,server,msg_manager) {}
-    
+
     websocketpp::lib::error_code ec;
 	stub_config::con_msg_manager_type::ptr msg_manager;
 	stub_config::request_type req;
@@ -63,44 +71,44 @@ typedef stub_config::message_type::ptr message_ptr;
 
 BOOST_AUTO_TEST_CASE( exact_match ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nOrigin: http://example.com\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
     env.req.replace_header("Sec-WebSocket-Key3","WjN}|M(6");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     env.ec = env.p.validate_handshake(env.req);
     BOOST_CHECK(!env.ec);
-    
+
     websocketpp::uri_ptr u;
 
     BOOST_CHECK_NO_THROW( u = env.p.get_uri(env.req) );
-    
+
     BOOST_CHECK_EQUAL(u->get_secure(), false);
     BOOST_CHECK_EQUAL(u->get_host(), "www.example.com");
     BOOST_CHECK_EQUAL(u->get_resource(), "/");
-    BOOST_CHECK_EQUAL(u->get_port(), websocketpp::URI_DEFAULT_PORT);
-    
+    BOOST_CHECK_EQUAL(u->get_port(), websocketpp::uri_default_port);
+
     env.p.process_handshake(env.req,"",env.res);
-    
+
     BOOST_CHECK_EQUAL(env.res.get_header("Connection"), "Upgrade");
     BOOST_CHECK_EQUAL(env.res.get_header("Upgrade"), "WebSocket");
     BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Origin"), "http://example.com");
-        
+
     BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Location"), "ws://www.example.com/");
     BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Key3"), "n`9eBk9z$R8pOtVb");
 }
 
 BOOST_AUTO_TEST_CASE( non_get_method ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
     env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::invalid_http_method );
@@ -108,12 +116,12 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
 
 BOOST_AUTO_TEST_CASE( old_http_version ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
     env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::invalid_http_version );
@@ -121,12 +129,12 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
     env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
@@ -134,12 +142,12 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
     env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
@@ -148,57 +156,57 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 BOOST_AUTO_TEST_CASE( bad_host ) {
 	processor_setup env(true);
     websocketpp::uri_ptr u;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nOrigin: http://example.com\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
     env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK( !env.p.validate_handshake(env.req) );
 
-    BOOST_CHECK_THROW( u = env.p.get_uri(env.req), websocketpp::uri_exception );
+    BOOST_CHECK( !env.p.get_uri(env.req)->get_valid() );
 }
 
 BOOST_AUTO_TEST_CASE( extract_subprotocols ) {
 	processor_setup env(true);
-    
+
     std::vector<std::string> subps;
-    
+
     BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
     BOOST_CHECK_EQUAL( subps.size(), 0 );
 }
 
 BOOST_AUTO_TEST_CASE( prepare_data_frame_null ) {
     processor_setup env(true);
-    
+
     message_ptr in = env.msg_manager->get_message();
     message_ptr out = env.msg_manager->get_message();
     message_ptr invalid;
 
 
-    // empty pointers arguements should return sane error 
+    // empty pointers arguements should return sane error
     BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,invalid), websocketpp::processor::error::invalid_arguments );
 
     BOOST_CHECK_EQUAL( env.p.prepare_data_frame(in,invalid), websocketpp::processor::error::invalid_arguments );
 
     BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,out), websocketpp::processor::error::invalid_arguments );
-    
+
     // test valid opcodes
     // text (1) should be the only valid opcode
     for (int i = 0; i < 0xF; i++) {
         in->set_opcode(websocketpp::frame::opcode::value(i));
-        
+
         env.ec = env.p.prepare_data_frame(in,out);
-        
+
         if (i != 1) {
             BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_opcode );
         } else {
             BOOST_CHECK_NE( env.ec, websocketpp::processor::error::invalid_opcode );
         }
     }
-    
+
     /*
      * TODO: tests for invalid UTF8
     char buf[2] = {0x00, 0x00};
@@ -213,15 +221,15 @@ BOOST_AUTO_TEST_CASE( prepare_data_frame_null ) {
 
 BOOST_AUTO_TEST_CASE( prepare_data_frame ) {
     processor_setup env(true);
-    
+
     message_ptr in = env.msg_manager->get_message();
     message_ptr out = env.msg_manager->get_message();
-    
+
     in->set_opcode(websocketpp::frame::opcode::text);
     in->set_payload("foo");
 
     env.ec = env.p.prepare_data_frame(in,out);
-    
+
     unsigned char raw_header[1] = {0x00};
     unsigned char raw_payload[4] = {0x66,0x6f,0x6f,0xff};
 

test/processors/hybi07.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ * Copyright (c) 2013, Peter Thorson. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE hybi_07_processor
@@ -38,6 +38,7 @@
 #include <websocketpp/message_buffer/alloc.hpp>
 #include <websocketpp/extensions/permessage_deflate/disabled.hpp>
 #include <websocketpp/random/none.hpp>
+#include <websocketpp/logger/stub.hpp>
 
 struct stub_config {
 	typedef websocketpp::http::parser::request request_type;
@@ -45,16 +46,21 @@ struct stub_config {
 
 	typedef websocketpp::message_buffer::message
 		<websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_manager_type;
-    
+
+    typedef websocketpp::log::stub alog_type;
+	typedef websocketpp::log::stub elog_type;
+
     typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-    
+
+    static const size_t max_message_size = 16000000;
+
     /// Extension related config
     static const bool enable_extensions = false;
-    
+
     /// Extension specific config
-    
+
     /// permessage_compress_config
     struct permessage_deflate_config {
         typedef stub_config::request_type request_type;
@@ -71,36 +77,31 @@ BOOST_AUTO_TEST_CASE( exact_match ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
     BOOST_CHECK(!ec);
-    
+
     websocketpp::uri_ptr u;
-    bool exception = false;
-    
-    try {
-    	u = p.get_uri(r);
-    } catch (const websocketpp::uri_exception& e) {
-    	exception = true;
-    }
-    
-    BOOST_CHECK(exception == false);
-    BOOST_CHECK(u->get_secure() == false);
-    BOOST_CHECK(u->get_host() == "www.example.com");
-    BOOST_CHECK(u->get_resource() == "/");
-    BOOST_CHECK(u->get_port() == websocketpp::uri_default_port);
-    
+
+    u = p.get_uri(r);
+
+    BOOST_CHECK(u->get_valid());
+    BOOST_CHECK(!u->get_secure());
+    BOOST_CHECK_EQUAL(u->get_host(), "www.example.com");
+    BOOST_CHECK_EQUAL(u->get_resource(), "/");
+    BOOST_CHECK_EQUAL(u->get_port(), websocketpp::uri_default_port);
+
     p.process_handshake(r,"",response);
-    
-    BOOST_CHECK(response.get_header("Connection") == "upgrade");
-    BOOST_CHECK(response.get_header("Upgrade") == "websocket");
-    BOOST_CHECK(response.get_header("Sec-WebSocket-Accept") == "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
+
+    BOOST_CHECK_EQUAL(response.get_header("Connection"), "upgrade");
+    BOOST_CHECK_EQUAL(response.get_header("Upgrade"), "websocket");
+    BOOST_CHECK_EQUAL(response.get_header("Sec-WebSocket-Accept"), "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
 }
 
 BOOST_AUTO_TEST_CASE( non_get_method ) {
@@ -112,9 +113,9 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
     websocketpp::lib::error_code ec;
 
     std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -128,11 +129,11 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -146,11 +147,11 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -164,11 +165,11 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -181,24 +182,16 @@ BOOST_AUTO_TEST_CASE( bad_host ) {
 	stub_config::con_msg_manager_type::ptr msg_manager;
 	stub_config::rng_type rng;
     websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
-    websocketpp::uri_ptr u;
-    bool exception = false;
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
     BOOST_CHECK( !ec );
-    
-    try {
-    	u = p.get_uri(r);
-    } catch (const websocketpp::uri_exception& e) {
-    	exception = true;
-    }
-    
-    BOOST_CHECK(exception == true);
+
+    BOOST_CHECK( !p.get_uri(r)->get_valid() );
 }

test/processors/hybi08.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ * Copyright (c) 2013, Peter Thorson. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE hybi_08_processor
@@ -38,6 +38,7 @@
 #include <websocketpp/message_buffer/alloc.hpp>
 #include <websocketpp/extensions/permessage_deflate/disabled.hpp>
 #include <websocketpp/random/none.hpp>
+#include <websocketpp/logger/stub.hpp>
 
 struct stub_config {
 	typedef websocketpp::http::parser::request request_type;
@@ -45,16 +46,21 @@ struct stub_config {
 
 	typedef websocketpp::message_buffer::message
 		<websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_manager_type;
 
+    typedef websocketpp::log::stub alog_type;
+	typedef websocketpp::log::stub elog_type;
+
     typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
 
+    static const size_t max_message_size = 16000000;
+
     /// Extension related config
     static const bool enable_extensions = false;
-    
+
     /// Extension specific config
-    
+
     /// permessage_deflate_config
     struct permessage_deflate_config {
         typedef stub_config::request_type request_type;
@@ -71,33 +77,28 @@ BOOST_AUTO_TEST_CASE( exact_match ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
     BOOST_CHECK(!ec);
-    
+
     websocketpp::uri_ptr u;
-    bool exception = false;
-    
-    try {
-    	u = p.get_uri(r);
-    } catch (const websocketpp::uri_exception& e) {
-    	exception = true;
-    }
-    
-    BOOST_CHECK(exception == false);
+
+    u = p.get_uri(r);
+
+    BOOST_CHECK(u->get_valid() == true);
     BOOST_CHECK(u->get_secure() == false);
     BOOST_CHECK(u->get_host() == "www.example.com");
     BOOST_CHECK(u->get_resource() == "/");
     BOOST_CHECK(u->get_port() == websocketpp::uri_default_port);
-    
+
     p.process_handshake(r,"",response);
-    
+
     BOOST_CHECK(response.get_header("Connection") == "upgrade");
     BOOST_CHECK(response.get_header("Upgrade") == "websocket");
     BOOST_CHECK(response.get_header("Sec-WebSocket-Accept") == "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
@@ -112,9 +113,9 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
     websocketpp::lib::error_code ec;
 
     std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -128,11 +129,11 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -146,11 +147,11 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -164,11 +165,11 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -182,24 +183,19 @@ BOOST_AUTO_TEST_CASE( bad_host ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
     websocketpp::uri_ptr u;
-    bool exception = false;
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
     BOOST_CHECK( !ec );
-    
-    try {
-    	u = p.get_uri(r);
-    } catch (const websocketpp::uri_exception& e) {
-    	exception = true;
-    }
-    
-    BOOST_CHECK(exception == true);
+
+    u = p.get_uri(r);
+
+    BOOST_CHECK( !u->get_valid() );
 }
 

test/processors/hybi13.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE hybi_13_processor
@@ -38,6 +38,7 @@
 #include <websocketpp/message_buffer/message.hpp>
 #include <websocketpp/message_buffer/alloc.hpp>
 #include <websocketpp/random/none.hpp>
+#include <websocketpp/logger/stub.hpp>
 
 #include <websocketpp/extensions/permessage_deflate/disabled.hpp>
 #include <websocketpp/extensions/permessage_deflate/enabled.hpp>
@@ -48,11 +49,14 @@ struct stub_config {
 
 	typedef websocketpp::message_buffer::message
 		<websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_manager_type;
-    
+
+    typedef websocketpp::log::stub alog_type;
+	typedef websocketpp::log::stub elog_type;
+
     typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-    
+
     struct permessage_deflate_config {
         typedef stub_config::request_type request_type;
     };
@@ -60,6 +64,7 @@ struct stub_config {
     typedef websocketpp::extensions::permessage_deflate::disabled
         <permessage_deflate_config> permessage_deflate_type;
 
+    static const size_t max_message_size = 16000000;
     static const bool enable_extensions = false;
 };
 
@@ -69,18 +74,22 @@ struct stub_config_ext {
 
 	typedef websocketpp::message_buffer::message
 		<websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_manager_type;
-    
+
+    typedef websocketpp::log::stub alog_type;
+	typedef websocketpp::log::stub elog_type;
+
     typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-    
+
     struct permessage_deflate_config {
         typedef stub_config_ext::request_type request_type;
     };
-    
+
     typedef websocketpp::extensions::permessage_deflate::enabled
         <permessage_deflate_config> permessage_deflate_type;
 
+    static const size_t max_message_size = 16000000;
     static const bool enable_extensions = true;
 };
 
@@ -90,10 +99,10 @@ typedef stub_config::message_type::ptr message_ptr;
 // Set up a structure that constructs new copies of all of the support structure
 // for using connection processors
 struct processor_setup {
-    processor_setup(bool server) 
+    processor_setup(bool server)
       : msg_manager(new con_msg_manager_type())
       , p(false,server,msg_manager,rng) {}
-    
+
     websocketpp::lib::error_code ec;
 	con_msg_manager_type::ptr msg_manager;
 	stub_config::rng_type rng;
@@ -103,10 +112,10 @@ struct processor_setup {
 };
 
 struct processor_setup_ext {
-    processor_setup_ext(bool server) 
+    processor_setup_ext(bool server)
       : msg_manager(new con_msg_manager_type())
       , p(false,server,msg_manager,rng) {}
-    
+
     websocketpp::lib::error_code ec;
 	con_msg_manager_type::ptr msg_manager;
 	stub_config::rng_type rng;
@@ -117,26 +126,26 @@ struct processor_setup_ext {
 
 BOOST_AUTO_TEST_CASE( exact_match ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK(!env.p.validate_handshake(env.req));
-    
+
     websocketpp::uri_ptr u;
-    
+
     BOOST_CHECK_NO_THROW( u = env.p.get_uri(env.req) );
-    
+
     BOOST_CHECK_EQUAL(u->get_secure(), false);
     BOOST_CHECK_EQUAL(u->get_host(), "www.example.com");
     BOOST_CHECK_EQUAL(u->get_resource(), "/");
     BOOST_CHECK_EQUAL(u->get_port(), websocketpp::uri_default_port);
-    
+
     env.p.process_handshake(env.req,"",env.res);
-    
+
     BOOST_CHECK_EQUAL(env.res.get_header("Connection"), "upgrade");
     BOOST_CHECK_EQUAL(env.res.get_header("Upgrade"), "websocket");
     BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Accept"), "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
@@ -146,9 +155,9 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
 	processor_setup env(true);
 
     std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK( env.p.validate_handshake(env.req) == websocketpp::processor::error::invalid_http_method );
@@ -156,11 +165,11 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
 
 BOOST_AUTO_TEST_CASE( old_http_version ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::invalid_http_version );
@@ -168,11 +177,11 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK( websocketpp::processor::is_websocket_handshake(env.req) );
     BOOST_CHECK_EQUAL( websocketpp::processor::get_websocket_version(env.req), env.p.get_version() );
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
@@ -180,11 +189,11 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
     processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK( websocketpp::processor::is_websocket_handshake(env.req) );
     BOOST_CHECK_EQUAL( websocketpp::processor::get_websocket_version(env.req), env.p.get_version() );
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
@@ -192,15 +201,15 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 
 BOOST_AUTO_TEST_CASE( bad_host ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK( websocketpp::processor::is_websocket_handshake(env.req) );
     BOOST_CHECK_EQUAL( websocketpp::processor::get_websocket_version(env.req), env.p.get_version() );
-    BOOST_CHECK( !env.p.validate_handshake(env.req) );    
-    BOOST_CHECK_THROW( env.p.get_uri(env.req), websocketpp::uri_exception );
+    BOOST_CHECK( !env.p.validate_handshake(env.req) );
+    BOOST_CHECK( !env.p.get_uri(env.req)->get_valid() );
 }
 
 // FRAME TESTS TO DO
@@ -224,11 +233,11 @@ BOOST_AUTO_TEST_CASE( frame_empty_binary_unmasked ) {
 	processor_setup env1(false);
 
 	size_t ret1 = env1.p.consume(frame,2,env1.ec);
-	
+
 	BOOST_CHECK_EQUAL( ret1, 2 );
 	BOOST_CHECK( !env1.ec );
-	BOOST_CHECK_EQUAL( env1.p.ready(), true );	
-	
+	BOOST_CHECK_EQUAL( env1.p.ready(), true );
+
 	// two separate chunks
 	processor_setup env2(false);
 
@@ -245,12 +254,12 @@ BOOST_AUTO_TEST_CASE( frame_small_binary_unmasked ) {
 	processor_setup env(false);
 
 	uint8_t frame[4] = {0x82, 0x02, 0x2A, 0x2A};
-	
+
 	BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
 	BOOST_CHECK_EQUAL( env.p.consume(frame,4,env.ec), 4 );
 	BOOST_CHECK( !env.ec );
 	BOOST_CHECK_EQUAL( env.p.ready(), true );
-	
+
 	message_ptr foo = env.p.get_message();
 
 	BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
@@ -272,7 +281,7 @@ BOOST_AUTO_TEST_CASE( frame_extended_binary_unmasked ) {
 	BOOST_CHECK_EQUAL( env.p.consume(frame,130,env.ec), 130 );
 	BOOST_CHECK( !env.ec );
 	BOOST_CHECK_EQUAL( env.p.ready(), true );
-	
+
 	message_ptr foo = env.p.get_message();
 
 	BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
@@ -289,7 +298,7 @@ BOOST_AUTO_TEST_CASE( frame_jumbo_binary_unmasked ) {
 	BOOST_CHECK_EQUAL( env.p.consume(frame,130,env.ec), 130 );
 	BOOST_CHECK( !env.ec );
 	BOOST_CHECK_EQUAL( env.p.ready(), true );
-	
+
 	message_ptr foo = env.p.get_message();
 
 	BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
@@ -315,7 +324,7 @@ BOOST_AUTO_TEST_CASE( rsv_bits_used ) {
 
 	for (int i = 0; i < 3; i++) {
 		processor_setup env(false);
-	
+
 		BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
 		BOOST_CHECK_GT( env.p.consume(frame[i],2,env.ec), 0 );
 	    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_rsv_bit  );
@@ -338,7 +347,7 @@ BOOST_AUTO_TEST_CASE( reserved_opcode_used ) {
 
 	for (int i = 0; i < 10; i++) {
 		processor_setup env(false);
-	
+
 		BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
 		BOOST_CHECK_GT( env.p.consume(frame[i],2,env.ec), 0 );
 	    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_opcode  );
@@ -370,7 +379,7 @@ BOOST_AUTO_TEST_CASE( fragmented_binary_message ) {
     BOOST_CHECK( !env0.ec );
 	BOOST_CHECK_EQUAL( env0.p.ready(), true );
 	BOOST_CHECK_EQUAL( env0.p.get_message()->get_payload(), "**" );
-	
+
 	// read fragmented message in two chunks
 	BOOST_CHECK_EQUAL( env0.p.get_message(), message_ptr() );
 	BOOST_CHECK_EQUAL( env0.p.consume(frame0,3,env0.ec), 3 );
@@ -442,25 +451,25 @@ BOOST_AUTO_TEST_CASE( frame_small_binary_masked ) {
 BOOST_AUTO_TEST_CASE( masked_fragmented_binary_message ) {
     processor_setup env(true);
 
-	uint8_t frame0[14] = {0x02, 0x81, 0xAB, 0x23, 0x98, 0x45, 0x81, 
+	uint8_t frame0[14] = {0x02, 0x81, 0xAB, 0x23, 0x98, 0x45, 0x81,
 	                     0x80, 0x81, 0xB8, 0x34, 0x12, 0xFF, 0x92};
 
 	// read fragmented message in one chunk
 	BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
 	BOOST_CHECK_EQUAL( env.p.consume(frame0,14,env.ec), 14 );
     BOOST_CHECK( !env.ec );
-	BOOST_CHECK_EQUAL( env.p.ready(), true );	
+	BOOST_CHECK_EQUAL( env.p.ready(), true );
 	BOOST_CHECK_EQUAL( env.p.get_message()->get_payload(), "**" );
 }
 
 BOOST_AUTO_TEST_CASE( prepare_data_frame ) {
 	processor_setup env(true);
-    
+
     message_ptr in = env.msg_manager->get_message();
     message_ptr out = env.msg_manager->get_message();
     message_ptr invalid;
 
-    // empty pointers arguements should return sane error 
+    // empty pointers arguements should return sane error
     BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,invalid), websocketpp::processor::error::invalid_arguments );
 
     BOOST_CHECK_EQUAL( env.p.prepare_data_frame(in,invalid), websocketpp::processor::error::invalid_arguments );
@@ -471,43 +480,73 @@ BOOST_AUTO_TEST_CASE( prepare_data_frame ) {
     // control opcodes should return an error, data ones shouldn't
     for (int i = 0; i < 0xF; i++) {
         in->set_opcode(websocketpp::frame::opcode::value(i));
-        
+
         env.ec = env.p.prepare_data_frame(in,out);
-        
+
         if (websocketpp::frame::opcode::is_control(in->get_opcode())) {
             BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_opcode );
         } else {
             BOOST_CHECK_NE( env.ec, websocketpp::processor::error::invalid_opcode );
         }
     }
-    
-    
+
+
     //in.set_payload("foo");
-    
+
     //e = prepare_data_frame(in,out);
 
 
 }
 
+BOOST_AUTO_TEST_CASE( single_frame_message_too_large ) {
+    processor_setup env(true);
+    
+    env.p.set_max_message_size(3);
+    
+	uint8_t frame0[10] = {0x82, 0x84, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01};
+
+	// read message that is one byte too large
+	BOOST_CHECK_EQUAL( env.p.consume(frame0,10,env.ec), 6 );
+    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::message_too_big );
+}
+
+BOOST_AUTO_TEST_CASE( multiple_frame_message_too_large ) {
+    processor_setup env(true);
+    
+    env.p.set_max_message_size(4);
+    
+	uint8_t frame0[8] = {0x02, 0x82, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01};
+	uint8_t frame1[9] = {0x80, 0x83, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01};
+
+	// read first message frame with size under the limit
+	BOOST_CHECK_EQUAL( env.p.consume(frame0,8,env.ec), 8 );
+    BOOST_CHECK( !env.ec );
+    
+    // read second message frame that puts the size over the limit
+    BOOST_CHECK_EQUAL( env.p.consume(frame1,9,env.ec), 6 );
+    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::message_too_big );
+}
+
+
 
 BOOST_AUTO_TEST_CASE( client_handshake_request ) {
     processor_setup env(false);
-    
+
     websocketpp::uri_ptr u(new websocketpp::uri("ws://localhost/"));
-    
+
     env.p.client_handshake_request(env.req,u, std::vector<std::string>());
-    
+
     BOOST_CHECK_EQUAL( env.req.get_method(), "GET" );
     BOOST_CHECK_EQUAL( env.req.get_version(), "HTTP/1.1");
     BOOST_CHECK_EQUAL( env.req.get_uri(), "/");
-    
+
     BOOST_CHECK_EQUAL( env.req.get_header("Host"), "localhost");
     BOOST_CHECK_EQUAL( env.req.get_header("Sec-WebSocket-Version"), "13");
     BOOST_CHECK_EQUAL( env.req.get_header("Connection"), "Upgrade");
     BOOST_CHECK_EQUAL( env.req.get_header("Upgrade"), "websocket");
 }
 
-// TODO: 
+// TODO:
 // test cases
 // - adding headers
 // - adding Upgrade header
@@ -524,48 +563,48 @@ BOOST_AUTO_TEST_CASE( client_handshake_request ) {
 
 BOOST_AUTO_TEST_CASE( client_handshake_response_404 ) {
     processor_setup env(false);
-    
+
     std::string res = "HTTP/1.1 404 Not Found\r\n\r\n";
     env.res.consume(res.data(),res.size());
-    
+
     BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::invalid_http_status );
 }
 
 BOOST_AUTO_TEST_CASE( client_handshake_response_no_upgrade ) {
     processor_setup env(false);
-    
+
     std::string res = "HTTP/1.1 101 Switching Protocols\r\n\r\n";
     env.res.consume(res.data(),res.size());
-    
+
     BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::missing_required_header );
 }
 
 BOOST_AUTO_TEST_CASE( client_handshake_response_no_connection ) {
     processor_setup env(false);
-    
+
     std::string res = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: foo, wEbsOckEt\r\n\r\n";
     env.res.consume(res.data(),res.size());
-    
+
     BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::missing_required_header );
 }
 
 BOOST_AUTO_TEST_CASE( client_handshake_response_no_accept ) {
     processor_setup env(false);
-    
+
     std::string res = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: foo, wEbsOckEt\r\nConnection: bar, UpGrAdE\r\n\r\n";
     env.res.consume(res.data(),res.size());
-    
+
     BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::missing_required_header );
 }
 
 BOOST_AUTO_TEST_CASE( client_handshake_response ) {
     processor_setup env(false);
-    
+
     env.req.append_header("Sec-WebSocket-Key", "dGhlIHNhbXBsZSBub25jZQ==");
-    
+
     std::string res = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: foo, wEbsOckEt\r\nConnection: bar, UpGrAdE\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n\r\n";
     env.res.consume(res.data(),res.size());
-    
+
     BOOST_CHECK( !env.p.validate_server_handshake_response(env.req,env.res) );
 }
 
@@ -576,7 +615,7 @@ BOOST_AUTO_TEST_CASE( extensions_disabled ) {
 
     std::pair<websocketpp::lib::error_code,std::string> neg_results;
     neg_results = env.p.negotiate_extensions(env.req);
-    
+
     BOOST_CHECK_EQUAL( neg_results.first, websocketpp::processor::error::extensions_disabled );
     BOOST_CHECK_EQUAL( neg_results.second, "" );
 }
@@ -588,7 +627,7 @@ BOOST_AUTO_TEST_CASE( extension_negotiation_blank ) {
 
     std::pair<websocketpp::lib::error_code,std::string> neg_results;
     neg_results = env.p.negotiate_extensions(env.req);
-    
+
     BOOST_CHECK( !neg_results.first );
     BOOST_CHECK_EQUAL( neg_results.second, "" );
 }
@@ -600,7 +639,7 @@ BOOST_AUTO_TEST_CASE( extension_negotiation_unknown ) {
 
     std::pair<websocketpp::lib::error_code,std::string> neg_results;
     neg_results = env.p.negotiate_extensions(env.req);
-    
+
     BOOST_CHECK( !neg_results.first );
     BOOST_CHECK_EQUAL( neg_results.second, "" );
 }
@@ -608,7 +647,7 @@ BOOST_AUTO_TEST_CASE( extension_negotiation_unknown ) {
 BOOST_AUTO_TEST_CASE( extract_subprotocols_empty ) {
 	processor_setup env(true);
     std::vector<std::string> subps;
-    
+
     BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
     BOOST_CHECK_EQUAL( subps.size(), 0 );
 }
@@ -616,9 +655,9 @@ BOOST_AUTO_TEST_CASE( extract_subprotocols_empty ) {
 BOOST_AUTO_TEST_CASE( extract_subprotocols_one ) {
 	processor_setup env(true);
     std::vector<std::string> subps;
-    
+
     env.req.replace_header("Sec-WebSocket-Protocol","foo");
-    
+
     BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
     BOOST_REQUIRE_EQUAL( subps.size(), 1 );
     BOOST_CHECK_EQUAL( subps[0], "foo" );
@@ -627,9 +666,9 @@ BOOST_AUTO_TEST_CASE( extract_subprotocols_one ) {
 BOOST_AUTO_TEST_CASE( extract_subprotocols_multiple ) {
 	processor_setup env(true);
     std::vector<std::string> subps;
-    
+
     env.req.replace_header("Sec-WebSocket-Protocol","foo,bar");
-    
+
     BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
     BOOST_REQUIRE_EQUAL( subps.size(), 2 );
     BOOST_CHECK_EQUAL( subps[0], "foo" );
@@ -639,24 +678,23 @@ BOOST_AUTO_TEST_CASE( extract_subprotocols_multiple ) {
 BOOST_AUTO_TEST_CASE( extract_subprotocols_invalid) {
 	processor_setup env(true);
     std::vector<std::string> subps;
-    
+
     env.req.replace_header("Sec-WebSocket-Protocol","foo,bar,,,,");
-    
+
     BOOST_CHECK_EQUAL( env.p.extract_subprotocols(env.req,subps), websocketpp::processor::error::make_error_code(websocketpp::processor::error::subprotocol_parse_error) );
     BOOST_CHECK_EQUAL( subps.size(), 0 );
 }
 
-/*BOOST_AUTO_TEST_CASE( extension_negotiation_permessage_deflate ) {
+BOOST_AUTO_TEST_CASE( extension_negotiation_permessage_deflate ) {
     processor_setup_ext env(true);
 
-    env.req.replace_header("Sec-WebSocket-Extensions","permessage-deflate; foo; bar=\"x x\"");
+    env.req.replace_header("Sec-WebSocket-Extensions",
+        "permessage-deflate; c2s_max_window_bits");
 
     std::pair<websocketpp::lib::error_code,std::string> neg_results;
     neg_results = env.p.negotiate_extensions(env.req);
-    
-    std::cout << neg_results.first.message() << neg_results.second << std::endl;
 
     BOOST_CHECK( !neg_results.first );
     BOOST_CHECK_EQUAL( neg_results.second, "permessage-deflate" );
-}*/
+}
 

test/processors/processor.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE processors
@@ -36,100 +36,100 @@
 
 BOOST_AUTO_TEST_CASE( exact_match ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
 }
 
 BOOST_AUTO_TEST_CASE( non_match ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(!websocketpp::processor::is_websocket_handshake(r));
 }
 
 BOOST_AUTO_TEST_CASE( ci_exact_match ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: UpGrAde\r\nUpgrade: WebSocket\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
 }
 
 BOOST_AUTO_TEST_CASE( non_exact_match1 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade,foo\r\nUpgrade: websocket,foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
 }
 
 BOOST_AUTO_TEST_CASE( non_exact_match2 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: keep-alive,Upgrade,foo\r\nUpgrade: foo,websocket,bar\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
 }
 
 BOOST_AUTO_TEST_CASE( version_blank ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 0);
 }
 
 BOOST_AUTO_TEST_CASE( version_7 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 7);
 }
 
 BOOST_AUTO_TEST_CASE( version_8 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 8);
 }
 
 BOOST_AUTO_TEST_CASE( version_13 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 13);
 }
 
 BOOST_AUTO_TEST_CASE( version_non_numeric ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: abc\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == -1);
 }

test/random/none.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE random_none
@@ -33,8 +33,8 @@
 
 BOOST_AUTO_TEST_CASE( does_it_compile ) {
     websocketpp::random::none::int_generator<int32_t> rng;
-    
+
     int32_t foo = rng();
-    
+
     BOOST_CHECK( foo == 0 );
-}
+}

test/random/random_device.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE random_device
@@ -36,15 +36,15 @@
 
 BOOST_AUTO_TEST_CASE( compiles ) {
     websocketpp::random::random_device::int_generator<int32_t,websocketpp::concurrency::none> rng;
-    
+
     bool e = false;
-    
+
     try {
         int32_t foo = rng();
         std::cout << foo << std::endl;
     } catch (...) {
         e = true;
     }
-    
+
     BOOST_CHECK( e == false );
 }

test/roles/SConscript

@@ -10,7 +10,7 @@ Import('polyfill_libs')
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
 
-BOOST_LIBS = boostlibs(['unit_test_framework','system','regex','random'],env) + [platform_libs]
+BOOST_LIBS = boostlibs(['unit_test_framework','system','random'],env) + [platform_libs]
 
 objs = env.Object('client_boost.o', ["client.cpp"], LIBS = BOOST_LIBS)
 objs += env.Object('server_boost.o', ["server.cpp"], LIBS = BOOST_LIBS)

test/roles/client.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE client
@@ -52,11 +52,11 @@ struct stub_config : public websocketpp::config::core {
 
     //typedef core::rng_type rng_type;
     typedef websocketpp::random::random_device::int_generator<uint32_t,concurrency_type> rng_type;
-    
+
     typedef core::transport_type transport_type;
-    
+
     typedef core::endpoint_base endpoint_base;
-    
+
     static const websocketpp::log::level elog_level = websocketpp::log::elevel::none;
     static const websocketpp::log::level alog_level = websocketpp::log::alevel::none;
 };
@@ -67,27 +67,27 @@ typedef client::connection_ptr connection_ptr;
 BOOST_AUTO_TEST_CASE( invalid_uri ) {
     client c;
     websocketpp::lib::error_code ec;
-    
+
     connection_ptr con = c.get_connection("foo", ec);
-    
+
     BOOST_CHECK_EQUAL( ec , websocketpp::error::make_error_code(websocketpp::error::invalid_uri) );
 }
 
 BOOST_AUTO_TEST_CASE( unsecure_endpoint ) {
     client c;
     websocketpp::lib::error_code ec;
-    
+
     connection_ptr con = c.get_connection("wss://localhost/", ec);
-    
+
     BOOST_CHECK_EQUAL( ec , websocketpp::error::make_error_code(websocketpp::error::endpoint_not_secure) );
 }
 
 BOOST_AUTO_TEST_CASE( get_connection ) {
     client c;
     websocketpp::lib::error_code ec;
-    
+
     connection_ptr con = c.get_connection("ws://localhost/", ec);
-    
+
     BOOST_CHECK( con );
     BOOST_CHECK_EQUAL( con->get_host() , "localhost" );
     BOOST_CHECK_EQUAL( con->get_port() , 80 );
@@ -100,34 +100,34 @@ BOOST_AUTO_TEST_CASE( connect_con ) {
     websocketpp::lib::error_code ec;
     std::stringstream out;
     std::string o;
-    
+
     c.register_ostream(&out);
-    
+
     connection_ptr con = c.get_connection("ws://localhost/", ec);
     c.connect(con);
-    
+
     o = out.str();
     websocketpp::http::parser::request r;
     r.consume(o.data(),o.size());
-    
+
     BOOST_CHECK( r.ready() );
     BOOST_CHECK_EQUAL( r.get_method(), "GET");
     BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1");
     BOOST_CHECK_EQUAL( r.get_uri(), "/");
-    
+
     BOOST_CHECK_EQUAL( r.get_header("Host"), "localhost");
     BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Version"), "13");
     BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade");
     BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket");
-    
+
     // Key is randomly generated & User-Agent will change so just check that
     // they are not empty.
     BOOST_CHECK_NE( r.get_header("Sec-WebSocket-Key"), "");
     BOOST_CHECK_NE( r.get_header("User-Agent"), "" );
-    
+
     // connection should have written out an opening handshake request and be in
     // the read response internal state
-        
+
     // TODO: more tests related to reading the HTTP response
     std::stringstream channel2;
 	channel2 << "e\r\n\r\n";
@@ -138,11 +138,11 @@ BOOST_AUTO_TEST_CASE( select_subprotocol ) {
     client c;
     websocketpp::lib::error_code ec;
     using websocketpp::error::make_error_code;
-    
+
     connection_ptr con = c.get_connection("ws://localhost/", ec);
-    
+
     BOOST_CHECK( con );
-    
+
     con->select_subprotocol("foo",ec);
     BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::server_only) );
     BOOST_CHECK_THROW( con->select_subprotocol("foo") , websocketpp::lib::error_code );
@@ -152,14 +152,14 @@ BOOST_AUTO_TEST_CASE( add_subprotocols_invalid ) {
     client c;
     websocketpp::lib::error_code ec;
     using websocketpp::error::make_error_code;
-    
+
     connection_ptr con = c.get_connection("ws://localhost/", ec);
     BOOST_CHECK( con );
-    
+
     con->add_subprotocol("",ec);
     BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::invalid_subprotocol) );
     BOOST_CHECK_THROW( con->add_subprotocol("") , websocketpp::lib::error_code );
-    
+
     con->add_subprotocol("foo,bar",ec);
     BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::invalid_subprotocol) );
     BOOST_CHECK_THROW( con->add_subprotocol("foo,bar") , websocketpp::lib::error_code );
@@ -170,23 +170,23 @@ BOOST_AUTO_TEST_CASE( add_subprotocols ) {
     websocketpp::lib::error_code ec;
     std::stringstream out;
     std::string o;
-    
+
     c.register_ostream(&out);
-    
+
     connection_ptr con = c.get_connection("ws://localhost/", ec);
     BOOST_CHECK( con );
-    
+
     con->add_subprotocol("foo",ec);
     BOOST_CHECK( !ec );
-    
+
     BOOST_CHECK_NO_THROW( con->add_subprotocol("bar") );
-    
+
     c.connect(con);
-    
+
     o = out.str();
     websocketpp::http::parser::request r;
     r.consume(o.data(),o.size());
-        
+
     BOOST_CHECK( r.ready() );
     BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "foo, bar");
 }

test/roles/server.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE server
@@ -56,9 +56,9 @@ using websocketpp::lib::bind;
     typedef core::elog_type elog_type;
 
     typedef core::rng_type rng_type;
-    
+
     typedef core::transport_type transport_type;
-    
+
     typedef core::endpoint_base endpoint_base;
 };*/
 
@@ -66,19 +66,19 @@ using websocketpp::lib::bind;
 std::string run_server_test(server& s, std::string input) {
     server::connection_ptr con;
     std::stringstream output;
-	
+
 	s.register_ostream(&output);
 	s.clear_access_channels(websocketpp::log::alevel::all);
     s.clear_error_channels(websocketpp::log::elevel::all);
-	
+
 	con = s.get_connection();
 	con->start();
-	
+
 	std::stringstream channel;
-	
+
 	channel << input;
 	channel >> *con;
-	
+
 	return output.str();
 }
 
@@ -91,28 +91,28 @@ bool validate_func_subprotocol(server* s, std::string* out, std::string accept,
     websocketpp::connection_hdl hdl)
 {
     server::connection_ptr con = s->get_con_from_hdl(hdl);
-    
+
     std::stringstream o;
-    
+
     const std::vector<std::string> & protocols = con->get_requested_subprotocols();
     std::vector<std::string>::const_iterator it;
-    
+
     for (it = protocols.begin(); it != protocols.end(); ++it) {
         o << *it << ",";
     }
 
     *out = o.str();
-    
+
     if (accept != "") {
         con->select_subprotocol(accept);
     }
-        
+
     return true;
 }
 
 void open_func_subprotocol(server* s, std::string* out, websocketpp::connection_hdl hdl) {
     server::connection_ptr con = s->get_con_from_hdl(hdl);
-    
+
     *out = con->get_subprotocol();
 }
 
@@ -120,21 +120,21 @@ void open_func_subprotocol(server* s, std::string* out, websocketpp::connection_
 BOOST_AUTO_TEST_CASE( basic_websocket_request ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	server s;
 	s.set_user_agent("test");
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
 }
 
 BOOST_AUTO_TEST_CASE( invalid_websocket_version ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: a\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
     std::string output = "HTTP/1.1 400 Bad Request\r\nServer: test\r\n\r\n";
-	    
+
     server s;
     s.set_user_agent("test");
 	//s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
 }
 
@@ -142,10 +142,10 @@ BOOST_AUTO_TEST_CASE( unimplemented_websocket_version ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 14\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
 
     std::string output = "HTTP/1.1 400 Bad Request\r\nSec-WebSocket-Version: 0,7,8,13\r\nServer: test\r\n\r\n";
-	
+
 	server s;
     s.set_user_agent("test");
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
 }
 
@@ -153,13 +153,13 @@ BOOST_AUTO_TEST_CASE( list_subprotocol_empty ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
 
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	std::string subprotocol;
-	
+
 	server s;
     s.set_user_agent("test");
 	s.set_open_handler(bind(&open_func_subprotocol,&s,&subprotocol,::_1));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
     BOOST_CHECK_EQUAL(subprotocol, "");
 }
@@ -168,15 +168,15 @@ BOOST_AUTO_TEST_CASE( list_subprotocol_one ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
 
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	std::string validate;
 	std::string open;
-	
+
 	server s;
     s.set_user_agent("test");
 	s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"",::_1));
 	s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
     BOOST_CHECK_EQUAL(validate, "foo,");
     BOOST_CHECK_EQUAL(open, "");
@@ -186,15 +186,15 @@ BOOST_AUTO_TEST_CASE( accept_subprotocol_one ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
 
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nSec-WebSocket-Protocol: foo\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	std::string validate;
 	std::string open;
-	
+
 	server s;
     s.set_user_agent("test");
 	s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"foo",::_1));
 	s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
     BOOST_CHECK_EQUAL(validate, "foo,");
     BOOST_CHECK_EQUAL(open, "foo");
@@ -204,17 +204,17 @@ BOOST_AUTO_TEST_CASE( accept_subprotocol_invalid ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
 
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nSec-WebSocket-Protocol: foo\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	std::string validate;
 	std::string open;
-	
+
 	server s;
     s.set_user_agent("test");
 	s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"foo2",::_1));
 	s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
-	
+
 	std::string o;
-	
+
 	BOOST_CHECK_THROW(o = run_server_test(s,input), websocketpp::lib::error_code);
 }
 
@@ -222,15 +222,15 @@ BOOST_AUTO_TEST_CASE( accept_subprotocol_two ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo, bar\r\n\r\n";
 
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nSec-WebSocket-Protocol: bar\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	std::string validate;
 	std::string open;
-	
+
 	server s;
     s.set_user_agent("test");
 	s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"bar",::_1));
 	s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
     BOOST_CHECK_EQUAL(validate, "foo,bar,");
     BOOST_CHECK_EQUAL(open, "bar");
@@ -239,9 +239,9 @@ BOOST_AUTO_TEST_CASE( accept_subprotocol_two ) {
 /*BOOST_AUTO_TEST_CASE( user_reject_origin ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example2.com\r\n\r\n";
     std::string output = "HTTP/1.1 403 Forbidden\r\nServer: test\r\n\r\n";
-	    
+
     server s;
     s.set_user_agent("test");
-	
+
     BOOST_CHECK(run_server_test(s,input) == output);
 }*/

test/transport/SConscript

@@ -11,7 +11,7 @@ Import('tls_libs')
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
 
-BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','regex','random'],env) + [platform_libs] + [tls_libs]
+BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','random'],env) + [platform_libs] + [tls_libs]
 
 objs = env.Object('boost_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS)
 prgs = env.Program('test_boost_integration', ["boost_integration.o"], LIBS = BOOST_LIBS)

test/transport/asio/SConscript

@@ -11,7 +11,7 @@ Import('tls_libs')
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
 
-BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','regex'],env) + [platform_libs] + [tls_libs]
+BOOST_LIBS = boostlibs(['unit_test_framework','system','thread'],env) + [platform_libs] + [tls_libs]
 
 objs = env.Object('base_boost.o', ["base.cpp"], LIBS = BOOST_LIBS)
 objs += env.Object('timers_boost.o', ["timers.cpp"], LIBS = BOOST_LIBS)

test/transport/asio/base.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE transport_asio_base
@@ -34,16 +34,16 @@
 
 BOOST_AUTO_TEST_CASE( blank_error ) {
     websocketpp::lib::error_code ec;
-        
+
     BOOST_CHECK( !ec );
 }
 
 BOOST_AUTO_TEST_CASE( asio_error ) {
     using websocketpp::transport::asio::error::make_error_code;
     using websocketpp::transport::asio::error::general;
-    
+
     websocketpp::lib::error_code ec = make_error_code(general);
-        
+
     BOOST_CHECK( ec == general );
     BOOST_CHECK( ec.value() == 1 );
-}
+}

test/transport/asio/timers.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE transport_asio_timers
@@ -52,12 +52,12 @@
 // Accept a connection, read data, and discard until EOF
 void run_dummy_server(int port) {
     using boost::asio::ip::tcp;
-    
-    try {    
+
+    try {
         boost::asio::io_service io_service;
         tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v6(), port));
         tcp::socket socket(io_service);
-    
+
         acceptor.accept(socket);
         for (;;) {
             char data[512];
@@ -94,7 +94,9 @@ struct config {
     typedef websocketpp::http::parser::request request_type;
     typedef websocketpp::http::parser::response response_type;
     typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
-    
+
+    static const bool enable_multithreading = true;
+
     static const long timeout_socket_pre_init = 1000;
     static const long timeout_proxy = 1000;
     static const long timeout_socket_post_init = 1000;
@@ -112,20 +114,20 @@ context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
 // Mock connection
 struct mock_con: public websocketpp::transport::asio::connection<config> {
     typedef websocketpp::transport::asio::connection<config> base;
-    
+
     mock_con(bool a, config::alog_type& b, config::elog_type& c) : base(a,b,c) {}
-    
+
     void start() {
         base::init(websocketpp::lib::bind(&mock_con::handle_start,this,
             websocketpp::lib::placeholders::_1));
     }
-    
+
     void handle_start(const websocketpp::lib::error_code& ec) {
         using websocketpp::transport::asio::socket::make_error_code;
         using websocketpp::transport::asio::socket::error::tls_handshake_timeout;
-        
+
         BOOST_CHECK_EQUAL( ec, make_error_code(tls_handshake_timeout) );
-        
+
         base::cancel_socket();
     }
 };
@@ -135,19 +137,20 @@ typedef websocketpp::lib::shared_ptr<mock_con> connection_ptr;
 
 struct mock_endpoint : public websocketpp::transport::asio::endpoint<config> {
     typedef websocketpp::transport::asio::endpoint<config> base;
-    
+
     mock_endpoint() {
         alog.set_channels(websocketpp::log::alevel::all);
         base::init_logging(&alog,&elog);
         init_asio();
     }
-    
+
     void connect(std::string u) {
         m_con.reset(new mock_con(false,alog,elog));
         websocketpp::uri_ptr uri(new websocketpp::uri(u));
-        
+
+        BOOST_CHECK( uri->get_valid() );
         BOOST_CHECK_EQUAL( base::init(m_con), websocketpp::lib::error_code() );
-        
+
         base::async_connect(
             m_con,
             uri,
@@ -155,19 +158,17 @@ struct mock_endpoint : public websocketpp::transport::asio::endpoint<config> {
                 &mock_endpoint::handle_connect,
                 this,
                 m_con,
-                websocketpp::lib::placeholders::_1,
-                websocketpp::lib::placeholders::_2
+                websocketpp::lib::placeholders::_1
             )
         );
     }
-    
-    void handle_connect(connection_ptr con, websocketpp::connection_hdl, 
-        const websocketpp::lib::error_code & ec)
+
+    void handle_connect(connection_ptr con, websocketpp::lib::error_code const & ec)
     {
         BOOST_CHECK( !ec );
         con->start();
     }
-    
+
     connection_ptr m_con;
     config::alog_type alog;
     config::elog_type elog;
@@ -178,9 +179,9 @@ BOOST_AUTO_TEST_CASE( tls_handshake_timeout ) {
     websocketpp::lib::thread timer(websocketpp::lib::bind(&run_test_timer,5000));
     dummy_server.detach();
     timer.detach();
-    
+
     mock_endpoint endpoint;
     endpoint.set_tls_init_handler(&on_tls_init);
     endpoint.connect("wss://localhost:9005");
     endpoint.run();
-}
+}

test/transport/hybi_util.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE hybi_util
@@ -36,15 +36,15 @@
 BOOST_AUTO_TEST_CASE( circshift_0 ) {
     if (sizeof(size_t) == 8) {
         size_t test = 0x0123456789abcdef;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,0);
-        
+
         BOOST_CHECK( test == 0x0123456789abcdef);
     } else {
         size_t test = 0x01234567;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,0);
-        
+
         BOOST_CHECK( test == 0x01234567);
     }
 }
@@ -52,15 +52,15 @@ BOOST_AUTO_TEST_CASE( circshift_0 ) {
 BOOST_AUTO_TEST_CASE( circshift_1 ) {
     if (sizeof(size_t) == 8) {
         size_t test = 0x0123456789abcdef;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,1);
-        
+
         BOOST_CHECK( test == 0xef0123456789abcd);
     } else {
         size_t test = 0x01234567;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,1);
-        
+
         BOOST_CHECK( test == 0x67012345);
     }
 }
@@ -68,15 +68,15 @@ BOOST_AUTO_TEST_CASE( circshift_1 ) {
 BOOST_AUTO_TEST_CASE( circshift_2 ) {
     if (sizeof(size_t) == 8) {
         size_t test = 0x0123456789abcdef;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,2);
-        
+
         BOOST_CHECK( test == 0xcdef0123456789ab);
     } else {
         size_t test = 0x01234567;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,2);
-        
+
         BOOST_CHECK( test == 0x45670123);
     }
 }
@@ -84,15 +84,15 @@ BOOST_AUTO_TEST_CASE( circshift_2 ) {
 BOOST_AUTO_TEST_CASE( circshift_3 ) {
     if (sizeof(size_t) == 8) {
         size_t test = 0x0123456789abcdef;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,3);
-        
+
         BOOST_CHECK( test == 0xabcdef0123456789);
     } else {
         size_t test = 0x01234567;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,3);
-        
+
         BOOST_CHECK( test == 0x23456701);
     }
 }

test/transport/integration.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE transport_integration
@@ -30,45 +30,90 @@
 
 #include <websocketpp/common/thread.hpp>
 
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/config/core.hpp>
+#include <websocketpp/config/core_client.hpp>
+#include <websocketpp/config/asio.hpp>
+#include <websocketpp/config/asio_client.hpp>
+#include <websocketpp/config/debug_asio.hpp>
 #include <websocketpp/server.hpp>
 #include <websocketpp/client.hpp>
 
 struct config : public websocketpp::config::asio_client {
     typedef config type;
     typedef websocketpp::config::asio base;
-    
+
     typedef base::concurrency_type concurrency_type;
-    
+
     typedef base::request_type request_type;
     typedef base::response_type response_type;
 
     typedef base::message_type message_type;
     typedef base::con_msg_manager_type con_msg_manager_type;
     typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-    
+
     typedef base::alog_type alog_type;
     typedef base::elog_type elog_type;
-    
+
     typedef base::rng_type rng_type;
-    
+
     struct transport_config : public base::transport_config {
         typedef type::concurrency_type concurrency_type;
         typedef type::alog_type alog_type;
         typedef type::elog_type elog_type;
         typedef type::request_type request_type;
         typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint 
+        typedef websocketpp::transport::asio::basic_socket::endpoint
             socket_type;
     };
 
-    typedef websocketpp::transport::asio::endpoint<transport_config> 
+    typedef websocketpp::transport::asio::endpoint<transport_config>
         transport_type;
-    
+
     //static const websocketpp::log::level elog_level = websocketpp::log::elevel::all;
     //static const websocketpp::log::level alog_level = websocketpp::log::alevel::all;
-    
+
+    /// Length of time before an opening handshake is aborted
+    static const long timeout_open_handshake = 500;
+    /// Length of time before a closing handshake is aborted
+    static const long timeout_close_handshake = 500;
+    /// Length of time to wait for a pong after a ping
+    static const long timeout_pong = 500;
+};
+
+struct config_tls : public websocketpp::config::asio_tls_client {
+    typedef config type;
+    typedef websocketpp::config::asio base;
+
+    typedef base::concurrency_type concurrency_type;
+
+    typedef base::request_type request_type;
+    typedef base::response_type response_type;
+
+    typedef base::message_type message_type;
+    typedef base::con_msg_manager_type con_msg_manager_type;
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef base::alog_type alog_type;
+    typedef base::elog_type elog_type;
+
+    typedef base::rng_type rng_type;
+
+    struct transport_config : public base::transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::alog_type alog_type;
+        typedef type::elog_type elog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+        typedef websocketpp::transport::asio::basic_socket::endpoint
+            socket_type;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config>
+        transport_type;
+
+    //static const websocketpp::log::level elog_level = websocketpp::log::elevel::all;
+    //static const websocketpp::log::level alog_level = websocketpp::log::alevel::all;
+
     /// Length of time before an opening handshake is aborted
     static const long timeout_open_handshake = 500;
     /// Length of time before a closing handshake is aborted
@@ -80,10 +125,25 @@ struct config : public websocketpp::config::asio_client {
 typedef websocketpp::server<config> server;
 typedef websocketpp::client<config> client;
 
+typedef websocketpp::server<config_tls> server_tls;
+typedef websocketpp::client<config_tls> client_tls;
+
+typedef websocketpp::server<websocketpp::config::core> iostream_server;
+typedef websocketpp::client<websocketpp::config::core_client> iostream_client;
+
 using websocketpp::lib::placeholders::_1;
 using websocketpp::lib::placeholders::_2;
 using websocketpp::lib::bind;
 
+template <typename T>
+void close_after_timeout(T & e, websocketpp::connection_hdl hdl, long timeout) {
+    sleep(timeout);
+
+    websocketpp::lib::error_code ec;
+    e.close(hdl,websocketpp::close::status::normal,"",ec);
+    BOOST_CHECK(!ec);
+}
+
 void run_server(server * s, int port, bool log = false) {
     if (log) {
         s->set_access_channels(websocketpp::log::alevel::all);
@@ -94,6 +154,7 @@ void run_server(server * s, int port, bool log = false) {
     }
 
     s->init_asio();
+    s->set_reuse_addr(true);
 
     s->listen(port);
     s->start_accept();
@@ -108,9 +169,11 @@ void run_client(client & c, std::string uri, bool log = false) {
         c.clear_access_channels(websocketpp::log::alevel::all);
         c.clear_error_channels(websocketpp::log::elevel::all);
     }
-    c.init_asio();
-    
     websocketpp::lib::error_code ec;
+    c.init_asio(ec);
+    c.set_reuse_addr(true);
+    BOOST_CHECK(!ec);
+
     client::connection_ptr con = c.get_connection(uri,ec);
     BOOST_CHECK( !ec );
     c.connect(con);
@@ -118,14 +181,50 @@ void run_client(client & c, std::string uri, bool log = false) {
     c.run();
 }
 
+void run_client_and_mark(client * c, bool * flag, websocketpp::lib::mutex * mutex) {
+    c->run();
+    BOOST_CHECK( true );
+    websocketpp::lib::lock_guard<websocketpp::lib::mutex> lock(*mutex);
+    *flag = true;
+    BOOST_CHECK( true );
+}
+
+void run_time_limited_client(client & c, std::string uri, long timeout,
+    bool log)
+{
+    if (log) {
+        c.set_access_channels(websocketpp::log::alevel::all);
+        c.set_error_channels(websocketpp::log::elevel::all);
+    } else {
+        c.clear_access_channels(websocketpp::log::alevel::all);
+        c.clear_error_channels(websocketpp::log::elevel::all);
+    }
+    c.init_asio();
+
+    websocketpp::lib::error_code ec;
+    client::connection_ptr con = c.get_connection(uri,ec);
+    BOOST_CHECK( !ec );
+    c.connect(con);
+
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(
+        &close_after_timeout<client>,
+        websocketpp::lib::ref(c),
+        con->get_handle(),
+        timeout
+    ));
+    tthread.detach();
+
+    c.run();
+}
+
 void run_dummy_server(int port) {
     using boost::asio::ip::tcp;
-    
-    try {    
+
+    try {
         boost::asio::io_service io_service;
         tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v6(), port));
         tcp::socket socket(io_service);
-    
+
         acceptor.accept(socket);
         for (;;) {
             char data[512];
@@ -147,14 +246,14 @@ void run_dummy_server(int port) {
 
 void run_dummy_client(std::string port) {
     using boost::asio::ip::tcp;
-    
-    try {    
+
+    try {
         boost::asio::io_service io_service;
         tcp::resolver resolver(io_service);
         tcp::resolver::query query("localhost", port);
         tcp::resolver::iterator iterator = resolver.resolve(query);
         tcp::socket socket(io_service);
-    
+
         boost::asio::connect(socket, iterator);
         for (;;) {
             char data[512];
@@ -179,7 +278,7 @@ bool on_ping(websocketpp::connection_hdl, std::string payload) {
 }
 
 void cancel_on_open(server * s, websocketpp::connection_hdl hdl) {
-    s->cancel();
+    s->stop_listening();
 }
 
 void stop_on_close(server * s, websocketpp::connection_hdl hdl) {
@@ -199,6 +298,16 @@ void fail_on_pong(websocketpp::connection_hdl hdl, std::string payload) {
     BOOST_FAIL( "expected no pong handler" );
 }
 
+void fail_on_pong_timeout(websocketpp::connection_hdl hdl, std::string payload) {
+    BOOST_FAIL( "expected no pong timeout" );
+}
+
+void req_pong(std::string expected_payload, websocketpp::connection_hdl hdl,
+    std::string payload)
+{
+    BOOST_CHECK_EQUAL( expected_payload, payload );
+}
+
 void fail_on_open(websocketpp::connection_hdl hdl) {
     BOOST_FAIL( "expected no open handler" );
 }
@@ -208,7 +317,7 @@ void delay(websocketpp::connection_hdl hdl, long duration) {
 }
 
 template <typename T>
-void check_ec(T * c, websocketpp::lib::error_code ec, 
+void check_ec(T * c, websocketpp::lib::error_code ec,
     websocketpp::connection_hdl hdl)
 {
     typename T::connection_ptr con = c->get_con_from_hdl(hdl);
@@ -218,7 +327,7 @@ void check_ec(T * c, websocketpp::lib::error_code ec,
 }
 
 template <typename T>
-void check_ec_and_stop(T * e, websocketpp::lib::error_code ec, 
+void check_ec_and_stop(T * e, websocketpp::lib::error_code ec,
     websocketpp::connection_hdl hdl)
 {
     typename T::connection_ptr con = e->get_con_from_hdl(hdl);
@@ -229,7 +338,7 @@ void check_ec_and_stop(T * e, websocketpp::lib::error_code ec,
 }
 
 template <typename T>
-void req_pong_timeout(T * c, std::string expected_payload, 
+void req_pong_timeout(T * c, std::string expected_payload,
     websocketpp::connection_hdl hdl, std::string payload)
 {
     typename T::connection_ptr con = c->get_con_from_hdl(hdl);
@@ -248,6 +357,27 @@ void run_test_timer(long value) {
     BOOST_FAIL( "Test timed out" );
 }
 
+BOOST_AUTO_TEST_CASE( pong_no_timeout ) {
+    server s;
+    client c;
+
+    s.set_close_handler(bind(&stop_on_close,&s,::_1));
+
+    // send a ping when the connection is open
+    c.set_open_handler(bind(&ping_on_open<client>,&c,"foo",::_1));
+    // require that a pong with matching payload is received
+    c.set_pong_handler(bind(&req_pong,"foo",::_1,::_2));
+    // require that a pong timeout is NOT received
+    c.set_pong_timeout_handler(bind(&fail_on_pong_timeout,::_1,::_2));
+
+    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
+
+    // Run a client that closes the connection after 1 seconds
+    run_time_limited_client(c, "http://localhost:9005", 1, false);
+
+    sthread.join();
+}
+
 BOOST_AUTO_TEST_CASE( pong_timeout ) {
     server s;
     client c;
@@ -255,24 +385,27 @@ BOOST_AUTO_TEST_CASE( pong_timeout ) {
     s.set_ping_handler(on_ping);
     s.set_close_handler(bind(&stop_on_close,&s,::_1));
 
+    c.set_fail_handler(bind(&check_ec<client>,&c,
+        websocketpp::lib::error_code(),::_1));
+
     c.set_pong_handler(bind(&fail_on_pong,::_1,::_2));
     c.set_open_handler(bind(&ping_on_open<client>,&c,"foo",::_1));
     c.set_pong_timeout_handler(bind(&req_pong_timeout<client>,&c,"foo",::_1,::_2));
     c.set_close_handler(bind(&check_ec<client>,&c,
         websocketpp::lib::error_code(),::_1));
-    
+
     websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
     websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     tthread.detach();
-    
+
     run_client(c, "http://localhost:9005",false);
-    
+
     sthread.join();
 }
 
 BOOST_AUTO_TEST_CASE( client_open_handshake_timeout ) {
     client c;
-    
+
     // set open handler to fail test
     c.set_open_handler(bind(&fail_on_open,::_1));
     // set fail hander to test for the right fail error code
@@ -283,13 +416,13 @@ BOOST_AUTO_TEST_CASE( client_open_handshake_timeout ) {
     websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     sthread.detach();
     tthread.detach();
-    
+
     run_client(c, "http://localhost:9005");
 }
 
 BOOST_AUTO_TEST_CASE( server_open_handshake_timeout ) {
     server s;
-    
+
     // set open handler to fail test
     s.set_open_handler(bind(&fail_on_open,::_1));
     // set fail hander to test for the right fail error code
@@ -299,9 +432,9 @@ BOOST_AUTO_TEST_CASE( server_open_handshake_timeout ) {
     websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
     websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     tthread.detach();
-    
+
     run_dummy_client("9005");
-    
+
     sthread.join();
 }
 
@@ -318,13 +451,13 @@ BOOST_AUTO_TEST_CASE( client_self_initiated_close_handshake_timeout ) {
     c.set_open_handler(bind(&close<client>,&c,::_1));
     c.set_close_handler(bind(&check_ec<client>,&c,
         websocketpp::error::close_handshake_timeout,::_1));
-    
+
     websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
     websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     tthread.detach();
-    
-    run_client(c, "http://localhost:9005",false);
-    
+
+    run_client(c, "http://localhost:9005", false);
+
     sthread.join();
 }
 
@@ -333,7 +466,7 @@ BOOST_AUTO_TEST_CASE( client_peer_initiated_close_handshake_timeout ) {
     // client should ack normally and then wait
     // server leaves TCP connection open
     // client handshake timer should be triggered
-    
+
     // TODO: how to make a mock server that leaves the TCP connection open?
 }
 
@@ -350,7 +483,7 @@ BOOST_AUTO_TEST_CASE( server_self_initiated_close_handshake_timeout ) {
         websocketpp::error::close_handshake_timeout,::_1));
 
     c.set_open_handler(bind(&delay,::_1,1));
-    
+
     websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
     websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     tthread.detach();
@@ -359,3 +492,115 @@ BOOST_AUTO_TEST_CASE( server_self_initiated_close_handshake_timeout ) {
 
     sthread.join();
 }
+
+BOOST_AUTO_TEST_CASE( client_runs_out_of_work ) {
+    client c;
+
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,3));
+    tthread.detach();
+
+    websocketpp::lib::error_code ec;
+    c.init_asio(ec);
+    BOOST_CHECK(!ec);
+
+    c.run();
+
+    // This test checks that an io_service with no work ends immediately.
+    BOOST_CHECK(true);
+}
+
+
+
+
+BOOST_AUTO_TEST_CASE( client_is_perpetual ) {
+    client c;
+    bool flag = false;
+    websocketpp::lib::mutex mutex;
+
+    websocketpp::lib::error_code ec;
+    c.init_asio(ec);
+    BOOST_CHECK(!ec);
+
+    c.start_perpetual();
+
+    websocketpp::lib::thread cthread(websocketpp::lib::bind(&run_client_and_mark,&c,&flag,&mutex));
+
+    sleep(1);
+
+    {
+        // Checks that the thread hasn't exited yet
+        websocketpp::lib::lock_guard<websocketpp::lib::mutex> lock(mutex);
+        BOOST_CHECK( !flag );
+    }
+
+    c.stop_perpetual();
+
+    sleep(1);
+
+    {
+        // Checks that the thread has exited
+        websocketpp::lib::lock_guard<websocketpp::lib::mutex> lock(mutex);
+        BOOST_CHECK( flag );
+    }
+
+    cthread.join();
+}
+
+BOOST_AUTO_TEST_CASE( client_failed_connection ) {
+    client c;
+
+    run_time_limited_client(c,"http://localhost:9005", 5, false);
+}
+
+BOOST_AUTO_TEST_CASE( stop_listening ) {
+    server s;
+    client c;
+
+    // the first connection stops the server from listening
+    s.set_open_handler(bind(&cancel_on_open,&s,::_1));
+
+    // client immediately closes after opening a connection
+    c.set_open_handler(bind(&close<client>,&c,::_1));
+
+    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,2));
+    tthread.detach();
+
+    run_client(c, "http://localhost:9005",false);
+
+    sthread.join();
+}
+
+BOOST_AUTO_TEST_CASE( pause_reading ) {
+    iostream_server s;
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
+    char buffer[2] = { char(0x81), char(0x80) };
+    
+    // suppress output (it needs a place to go to avoid error but we don't care what it is)
+    std::stringstream null_output;
+    s.register_ostream(&null_output);
+    
+    iostream_server::connection_ptr con = s.get_connection();
+    con->start();
+
+    // read handshake, should work
+    BOOST_CHECK_EQUAL( con->read_some(handshake.data(), handshake.length()), handshake.length());
+    
+    // pause reading and try again. The first read should work, the second should return 0
+    // the first read was queued already after the handshake so it will go through because
+    // reading wasn't paused when it was queued. The byte it reads wont be enough to
+    // complete the frame so another read will be requested. This one wont actually happen
+    // because the connection is paused now.
+    con->pause_reading();
+    BOOST_CHECK_EQUAL( con->read_some(buffer, 1), 1);
+    BOOST_CHECK_EQUAL( con->read_some(buffer+1, 1), 0);
+    // resume reading and try again. Should work this time because the resume should have
+    // re-queued a read.
+    con->resume_reading();
+    BOOST_CHECK_EQUAL( con->read_some(buffer+1, 1), 1);
+}
+
+
+BOOST_AUTO_TEST_CASE( server_connection_cleanup ) {
+    server_tls s;
+}

test/transport/iostream/base.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE transport_iostream_base
@@ -30,4 +30,4 @@
 
 #include <iostream>
 
-BOOST_AUTO_TEST_CASE( placeholder ) {}
+BOOST_AUTO_TEST_CASE( placeholder ) {}

test/transport/iostream/connection.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE transport_iostream_connection
@@ -32,6 +32,8 @@
 #include <cstring>
 #include <string>
 
+#include <websocketpp/common/memory.hpp>
+
 #include <websocketpp/error.hpp>
 #include <websocketpp/transport/iostream/connection.hpp>
 
@@ -52,38 +54,45 @@ typedef websocketpp::transport::iostream::connection<config> iostream_con;
 using websocketpp::transport::iostream::error::make_error_code;
 
 struct stub_con : public iostream_con {
+    typedef stub_con type;
+    typedef websocketpp::lib::shared_ptr<type> ptr;
     typedef iostream_con::timer_ptr timer_ptr;
 
-    stub_con(bool is_server, config::alog_type &a, config::elog_type & e) 
+    stub_con(bool is_server, config::alog_type & a, config::elog_type & e)
         : iostream_con(is_server,a,e)
         // Set the error to a known code that is unused by the library
         // This way we can easily confirm that the handler was run at all.
         , ec(websocketpp::error::make_error_code(websocketpp::error::test))
     {}
-    
+
+    /// Get a shared pointer to this component
+    ptr get_shared() {
+        return websocketpp::lib::static_pointer_cast<type>(iostream_con::get_shared());
+    }
+
     void write(std::string msg) {
         iostream_con::async_write(
             msg.data(),
             msg.size(),
             websocketpp::lib::bind(
                 &stub_con::handle_op,
-                this,
+                type::get_shared(),
                 websocketpp::lib::placeholders::_1
             )
         );
     }
-    
+
     void write(std::vector<websocketpp::transport::buffer> & bufs) {
         iostream_con::async_write(
             bufs,
             websocketpp::lib::bind(
                 &stub_con::handle_op,
-                this,
+                type::get_shared(),
                 websocketpp::lib::placeholders::_1
             )
         );
     }
-    
+
     void async_read_at_least(size_t num_bytes, char *buf, size_t len)
 	{
         iostream_con::async_read_at_least(
@@ -92,191 +101,261 @@ struct stub_con : public iostream_con {
             len,
             websocketpp::lib::bind(
                 &stub_con::handle_op,
-                this,
+                type::get_shared(),
                 websocketpp::lib::placeholders::_1
             )
         );
     }
-    
-    void handle_op(const websocketpp::lib::error_code& e) {
+
+    void handle_op(websocketpp::lib::error_code const & e) {
         ec = e;
     }
-    
+
     websocketpp::lib::error_code ec;
 };
 
 // Stubs
-config::alog_type a;
-config::elog_type e;
+config::alog_type alogger;
+config::elog_type elogger;
 
 BOOST_AUTO_TEST_CASE( const_methods ) {
-    iostream_con con(true,a,e);
-		
-    BOOST_CHECK( con.is_secure() == false );
-    BOOST_CHECK( con.get_remote_endpoint() == "iostream transport" );
+    iostream_con::ptr con(new iostream_con(true,alogger,elogger));
+
+    BOOST_CHECK( con->is_secure() == false );
+    BOOST_CHECK( con->get_remote_endpoint() == "iostream transport" );
 }
 
 BOOST_AUTO_TEST_CASE( write_before_ostream_set ) {
-    stub_con con(true,a,e);
-        
-    con.write("foo");
-    BOOST_CHECK( con.ec == make_error_code(websocketpp::transport::iostream::error::output_stream_required) );
-    
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    con->write("foo");
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::transport::iostream::error::output_stream_required) );
+
     std::vector<websocketpp::transport::buffer> bufs;
-    con.write(bufs);
-    BOOST_CHECK( con.ec == make_error_code(websocketpp::transport::iostream::error::output_stream_required) );
+    con->write(bufs);
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::transport::iostream::error::output_stream_required) );
 }
 
 BOOST_AUTO_TEST_CASE( async_write ) {
-    stub_con con(true,a,e);
-    
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
     std::stringstream output;
-    
-    con.register_ostream(&output);
-        
-    con.write("foo");
-    
-    BOOST_CHECK( !con.ec );
+
+    con->register_ostream(&output);
+
+    con->write("foo");
+
+    BOOST_CHECK( !con->ec );
     BOOST_CHECK( output.str() == "foo" );
 }
 
 BOOST_AUTO_TEST_CASE( async_write_vector_0 ) {
     std::stringstream output;
-    
-    stub_con con(true,a,e);
-    con.register_ostream(&output);
-        
+
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    con->register_ostream(&output);
+
     std::vector<websocketpp::transport::buffer> bufs;
-    
-    con.write(bufs);
-    
-    BOOST_CHECK( !con.ec );
+
+    con->write(bufs);
+
+    BOOST_CHECK( !con->ec );
     BOOST_CHECK( output.str() == "" );
 }
 
 BOOST_AUTO_TEST_CASE( async_write_vector_1 ) {
     std::stringstream output;
-    
-    stub_con con(true,a,e);
-    con.register_ostream(&output);
-        
+
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    con->register_ostream(&output);
+
     std::vector<websocketpp::transport::buffer> bufs;
-    
+
     std::string foo = "foo";
-    
+
     bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
-    
-    con.write(bufs);
-    
-    BOOST_CHECK( !con.ec );
+
+    con->write(bufs);
+
+    BOOST_CHECK( !con->ec );
     BOOST_CHECK( output.str() == "foo" );
 }
 
 BOOST_AUTO_TEST_CASE( async_write_vector_2 ) {
     std::stringstream output;
-    
-    stub_con con(true,a,e);
-    con.register_ostream(&output);
-        
+
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    con->register_ostream(&output);
+
     std::vector<websocketpp::transport::buffer> bufs;
-    
+
     std::string foo = "foo";
     std::string bar = "bar";
-    
+
     bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
     bufs.push_back(websocketpp::transport::buffer(bar.data(),bar.size()));
-    
-    con.write(bufs);
-    
-    BOOST_CHECK( !con.ec );
+
+    con->write(bufs);
+
+    BOOST_CHECK( !con->ec );
     BOOST_CHECK( output.str() == "foobar" );
 }
 
 BOOST_AUTO_TEST_CASE( async_read_at_least_too_much ) {
-    stub_con con(true,a,e);
-    
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
     char buf[10];
-        
-    con.async_read_at_least(11,buf,10);
-    BOOST_CHECK( con.ec == make_error_code(websocketpp::transport::iostream::error::invalid_num_bytes) );
+
+    con->async_read_at_least(11,buf,10);
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::transport::iostream::error::invalid_num_bytes) );
 }
 
 BOOST_AUTO_TEST_CASE( async_read_at_least_double_read ) {
-    stub_con con(true,a,e);
-    
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
     char buf[10];
-        
-    con.async_read_at_least(5,buf,10);
-    con.async_read_at_least(5,buf,10);
-    BOOST_CHECK( con.ec == make_error_code(websocketpp::transport::iostream::error::double_read) );
+
+    con->async_read_at_least(5,buf,10);
+    con->async_read_at_least(5,buf,10);
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::transport::iostream::error::double_read) );
 }
 
 BOOST_AUTO_TEST_CASE( async_read_at_least ) {
-    stub_con con(true,a,e);
-    
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
     char buf[10];
-    
+
     memset(buf,'x',10);
-    
-    con.async_read_at_least(5,buf,10);
-    BOOST_CHECK( con.ec == make_error_code(websocketpp::error::test) );
-    
+
+    con->async_read_at_least(5,buf,10);
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::error::test) );
+
     std::stringstream channel;
 	channel << "abcd";
-	channel >> con;
+	channel >> *con;
 	BOOST_CHECK( channel.tellg() == -1 );
-    BOOST_CHECK( con.ec == make_error_code(websocketpp::error::test) );
-    
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::error::test) );
+
     std::stringstream channel2;
 	channel2 << "e";
-	channel2 >> con;
+	channel2 >> *con;
 	BOOST_CHECK( channel2.tellg() == -1 );
-    BOOST_CHECK( !con.ec );
+    BOOST_CHECK( !con->ec );
     BOOST_CHECK( std::string(buf,10) == "abcdexxxxx" );
-    
+
     std::stringstream channel3;
 	channel3 << "f";
-	channel3 >> con;
+	channel3 >> *con;
 	BOOST_CHECK( channel3.tellg() == 0 );
-    BOOST_CHECK( !con.ec );
+    BOOST_CHECK( !con->ec );
     BOOST_CHECK( std::string(buf,10) == "abcdexxxxx" );
-    con.async_read_at_least(1,buf+5,5);
-    channel3 >> con;
+    con->async_read_at_least(1,buf+5,5);
+    channel3 >> *con;
     BOOST_CHECK( channel3.tellg() == -1 );
-    BOOST_CHECK( !con.ec );
+    BOOST_CHECK( !con->ec );
     BOOST_CHECK( std::string(buf,10) == "abcdefxxxx" );
 }
 
 BOOST_AUTO_TEST_CASE( async_read_at_least2 ) {
-    stub_con con(true,a,e);
-    
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
     char buf[10];
-    
+
     memset(buf,'x',10);
-    
-    con.async_read_at_least(5,buf,5);
-    BOOST_CHECK( con.ec == make_error_code(websocketpp::error::test) );
-    
+
+    con->async_read_at_least(5,buf,5);
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::error::test) );
+
     std::stringstream channel;
 	channel << "abcdefg";
-	channel >> con;
+	channel >> *con;
     BOOST_CHECK( channel.tellg() == 5 );
-    BOOST_CHECK( !con.ec );
+    BOOST_CHECK( !con->ec );
     BOOST_CHECK( std::string(buf,10) == "abcdexxxxx" );
-    
-    con.async_read_at_least(1,buf+5,5);
-	channel >> con;
+
+    con->async_read_at_least(1,buf+5,5);
+	channel >> *con;
 	BOOST_CHECK( channel.tellg() == -1 );
-    BOOST_CHECK( !con.ec );
+    BOOST_CHECK( !con->ec );
     BOOST_CHECK( std::string(buf,10) == "abcdefgxxx" );
 }
 
 void timer_callback_stub(const websocketpp::lib::error_code & ec) {}
 
 BOOST_AUTO_TEST_CASE( set_timer ) {
-    stub_con con(true,a,e);
-    
-    stub_con::timer_ptr tp = con.set_timer(1000,timer_callback_stub);
-    
+   stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    stub_con::timer_ptr tp = con->set_timer(1000,timer_callback_stub);
+
     BOOST_CHECK( !tp );
 }
+
+BOOST_AUTO_TEST_CASE( async_read_at_least_read_some ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    char buf[10];
+    memset(buf,'x',10);
+
+    con->async_read_at_least(5,buf,5);
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::error::test) );
+
+    char input[10] = "abcdefg";
+    BOOST_CHECK_EQUAL(con->read_some(input,5), 5);
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
+
+    BOOST_CHECK_EQUAL(con->read_some(input+5,2), 0);
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
+
+    con->async_read_at_least(1,buf+5,5);
+    BOOST_CHECK_EQUAL(con->read_some(input+5,2), 2);
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdefgxxx" );
+}
+
+BOOST_AUTO_TEST_CASE( eof_flag ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    char buf[10];
+    con->async_read_at_least(5,buf,5);
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::error::test) );
+    con->eof();
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::eof) );
+}
+
+BOOST_AUTO_TEST_CASE( fatal_error_flag ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    char buf[10];
+    con->async_read_at_least(5,buf,5);
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::error::test) );
+    con->fatal_error();
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::pass_through) );
+}
+
+BOOST_AUTO_TEST_CASE( shared_pointer_memory_cleanup ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    BOOST_CHECK_EQUAL(con.use_count(), 1);
+
+    char buf[10];
+    memset(buf,'x',10);
+    con->async_read_at_least(5,buf,5);
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::error::test) );
+    BOOST_CHECK_EQUAL(con.use_count(), 2);
+
+    char input[10] = "foo";
+    con->read_some(input,3);
+    BOOST_CHECK_EQUAL(con.use_count(), 2);
+
+    con->read_some(input,2);
+    BOOST_CHECK_EQUAL( std::string(buf,10), "foofoxxxxx" );
+    BOOST_CHECK_EQUAL(con.use_count(), 1);
+
+    con->async_read_at_least(5,buf,5);
+    BOOST_CHECK_EQUAL(con.use_count(), 2);
+
+    con->eof();
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::eof) );
+    BOOST_CHECK_EQUAL(con.use_count(), 1);
+}
+

test/transport/iostream/endpoint.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE transport_iostream_endpoint
@@ -36,6 +36,6 @@ BOOST_AUTO_TEST_CASE( placeholder ) {}
 
 /*BOOST_AUTO_TEST_CASE( blank_error ) {
 	websocketpp::lib::error_code ec;
-		
+
     BOOST_CHECK( !ec );
-}*/
+}*/

test/utility/SConscript

@@ -10,23 +10,27 @@ Import('polyfill_libs')
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
 
-BOOST_LIBS = boostlibs(['unit_test_framework','regex','system'],env) + [platform_libs]
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
 
 objs = env.Object('uri_boost.o', ["uri.cpp"], LIBS = BOOST_LIBS)
 objs += env.Object('utilities_boost.o', ["utilities.cpp"], LIBS = BOOST_LIBS)
 objs += env.Object('close_boost.o', ["close.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('sha1_boost.o', ["sha1.cpp"], LIBS = BOOST_LIBS)
 prgs = env.Program('test_uri_boost', ["uri_boost.o"], LIBS = BOOST_LIBS)
 prgs += env.Program('test_utility_boost', ["utilities_boost.o"], LIBS = BOOST_LIBS)
 prgs += env.Program('test_frame', ["frame.cpp"], LIBS = BOOST_LIBS)
 prgs += env.Program('test_close_boost', ["close_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_sha1_boost', ["sha1_boost.o"], LIBS = BOOST_LIBS)
 
 if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
    objs += env_cpp11.Object('utilities_stl.o', ["utilities.cpp"], LIBS = BOOST_LIBS_CPP11)
    objs += env_cpp11.Object('uri_stl.o', ["uri.cpp"], LIBS = BOOST_LIBS_CPP11)
    objs += env_cpp11.Object('close_stl.o', ["close.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('sha1_stl.o', ["sha1.cpp"], LIBS = BOOST_LIBS_CPP11)
    prgs += env_cpp11.Program('test_utility_stl', ["utilities_stl.o"], LIBS = BOOST_LIBS_CPP11)
    prgs += env_cpp11.Program('test_uri_stl', ["uri_stl.o"], LIBS = BOOST_LIBS_CPP11)
    prgs += env_cpp11.Program('test_close_stl', ["close_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_sha1_stl', ["sha1_stl.o"], LIBS = BOOST_LIBS_CPP11)
 
 Return('prgs')

test/utility/close.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE close
@@ -39,8 +39,6 @@ using namespace websocketpp;
 BOOST_AUTO_TEST_CASE( reserved_values ) {
 	BOOST_CHECK( !close::status::reserved(999) );
 	BOOST_CHECK( close::status::reserved(1004) );
-	BOOST_CHECK( close::status::reserved(1012) );
-	BOOST_CHECK( close::status::reserved(1013) );
 	BOOST_CHECK( close::status::reserved(1014) );
 	BOOST_CHECK( close::status::reserved(1016) );
 	BOOST_CHECK( close::status::reserved(2999) );
@@ -62,25 +60,25 @@ BOOST_AUTO_TEST_CASE( invalid_values ) {
 BOOST_AUTO_TEST_CASE( value_extraction ) {
 	lib::error_code ec;
 	std::string payload = "oo";
-	
+
 	// Value = 1000
 	payload[0] = 0x03;
 	payload[1] = char(0xe8);
 	BOOST_CHECK( close::extract_code(payload,ec) == close::status::normal );
 	BOOST_CHECK( !ec );
-	
+
 	// Value = 1004
 	payload[0] = 0x03;
 	payload[1] = char(0xec);
 	BOOST_CHECK( close::extract_code(payload,ec) == 1004 );
 	BOOST_CHECK( ec == error::reserved_close_code );
-	
+
 	// Value = 1005
 	payload[0] = 0x03;
 	payload[1] = char(0xed);
 	BOOST_CHECK( close::extract_code(payload,ec) == close::status::no_status );
 	BOOST_CHECK( ec == error::invalid_close_code );
-	
+
 	// Value = 3000
 	payload[0] = 0x0b;
 	payload[1] = char(0xb8);
@@ -91,7 +89,7 @@ BOOST_AUTO_TEST_CASE( value_extraction ) {
 BOOST_AUTO_TEST_CASE( extract_empty ) {
 	lib::error_code ec;
 	std::string payload = "";
-	
+
 	BOOST_CHECK( close::extract_code(payload,ec) == close::status::no_status );
 	BOOST_CHECK( !ec );
 }
@@ -99,7 +97,7 @@ BOOST_AUTO_TEST_CASE( extract_empty ) {
 BOOST_AUTO_TEST_CASE( extract_short ) {
 	lib::error_code ec;
 	std::string payload = "0";
-	
+
 	BOOST_CHECK( close::extract_code(payload,ec) == close::status::protocol_error );
 	BOOST_CHECK( ec == error::bad_close_code );
 }
@@ -107,21 +105,21 @@ BOOST_AUTO_TEST_CASE( extract_short ) {
 BOOST_AUTO_TEST_CASE( extract_reason ) {
 	lib::error_code ec;
 	std::string payload = "00Foo";
-	
+
 	BOOST_CHECK( close::extract_reason(payload,ec) == "Foo" );
 	BOOST_CHECK( !ec );
-	
+
 	payload = "";
 	BOOST_CHECK( close::extract_reason(payload,ec) == "" );
 	BOOST_CHECK( !ec );
-	
+
 	payload = "00";
 	BOOST_CHECK( close::extract_reason(payload,ec) == "" );
 	BOOST_CHECK( !ec );
-	
+
 	payload = "000";
 	payload[2] = char(0xFF);
-	
+
 	close::extract_reason(payload,ec);
 	BOOST_CHECK( ec == error::invalid_utf8 );
-}
+}

test/utility/frame.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE frame
@@ -39,7 +39,7 @@ using namespace websocketpp;
 BOOST_AUTO_TEST_CASE( basic_bits ) {
 	frame::basic_header h1(0x00,0x00); // all false
 	frame::basic_header h2(0xF0,0x80); // all true
-	
+
 	// Read Values
 	BOOST_CHECK( frame::get_fin(h1) == false );
 	BOOST_CHECK( frame::get_rsv1(h1) == false );
@@ -52,20 +52,20 @@ BOOST_AUTO_TEST_CASE( basic_bits ) {
 	BOOST_CHECK( frame::get_rsv2(h2) == true );
 	BOOST_CHECK( frame::get_rsv3(h2) == true );
 	BOOST_CHECK( frame::get_masked(h2) == true );
-	
+
 	// Set Values
 	frame::set_fin(h1,true);
 	BOOST_CHECK( h1.b0 == 0x80 );
-	
+
 	frame::set_rsv1(h1,true);
 	BOOST_CHECK( h1.b0 == 0xC0 );
-	
+
 	frame::set_rsv2(h1,true);
 	BOOST_CHECK( h1.b0 == 0xE0 );
-	
+
 	frame::set_rsv3(h1,true);
 	BOOST_CHECK( h1.b0 == 0xF0 );
-	
+
 	frame::set_masked(h1,true);
 	BOOST_CHECK( h1.b1 == 0x80 );
 }
@@ -105,19 +105,19 @@ BOOST_AUTO_TEST_CASE( basic_size ) {
 	BOOST_CHECK( frame::get_basic_size(h4) == 126 );
 	BOOST_CHECK( frame::get_basic_size(h5) == 127 );
 	BOOST_CHECK( frame::get_basic_size(h6) == 0 );
-	
+
 	/*frame::set_basic_size(h1,1);
 	BOOST_CHECK( h1.b1 == 0x01 );
-	
+
 	frame::set_basic_size(h1,125);
 	BOOST_CHECK( h1.b1 == 0x7D );
-	
+
 	frame::set_basic_size(h1,126);
 	BOOST_CHECK( h1.b1 == 0x7E );
-	
+
 	frame::set_basic_size(h1,127);
 	BOOST_CHECK( h1.b1 == 0x7F );
-	
+
 	frame::set_basic_size(h1,0);
 	BOOST_CHECK( h1.b1 == 0x00 );*/
 }
@@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE( basic_header_length ) {
 
 BOOST_AUTO_TEST_CASE( basic_opcode ) {
 	frame::basic_header h1(0x00,0x00);
-	
+
 	BOOST_CHECK( is_control(frame::opcode::CONTINUATION) == false);
 	BOOST_CHECK( is_control(frame::opcode::TEXT) == false);
 	BOOST_CHECK( is_control(frame::opcode::BINARY) == false);
@@ -155,7 +155,7 @@ BOOST_AUTO_TEST_CASE( extended_header_basics ) {
 	frame::extended_header h1;
 	uint8_t h1_solution[12] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 		                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-	
+
 	frame::extended_header h2(uint16_t(255));
 	uint8_t h2_solution[12] = {0x00, 0xFF, 0x00, 0x00, 0x00, 0x00,
 		                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -193,7 +193,7 @@ BOOST_AUTO_TEST_CASE( extended_header_extractors ) {
 	BOOST_CHECK( get_payload_size(h2,e2) == 0x0807060504030201LL );
 	BOOST_CHECK( get_masking_key_offset(h2) == 8 );
 	BOOST_CHECK( get_masking_key(h2,e2).i == 0 );
-		
+
 	frame::basic_header h3(0x00,0xFE);
 	frame::extended_header e3(uint16_t(255),0x08040201);
 	BOOST_CHECK( get_extended_size(e3) == 255 );
@@ -217,30 +217,30 @@ BOOST_AUTO_TEST_CASE( header_preparation ) {
 	frame::basic_header h1(0x81,0xFF); //
 	frame::extended_header e1(uint64_t(0xFFFFFLL),htonl(0xD5FB70EE));
 	std::string p1 = prepare_header(h1, e1);
-	uint8_t s1[14] = {0x81, 0xFF, 
-	                 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 
+	uint8_t s1[14] = {0x81, 0xFF,
+	                 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFF,
 	                 0xD5, 0xFB, 0x70, 0xEE};
-	
+
 	BOOST_CHECK( p1.size() == 14);
 	BOOST_CHECK( std::equal(p1.begin(),p1.end(),reinterpret_cast<char*>(s1)) );
-	
+
 	frame::basic_header h2(0x81,0x7E); //
 	frame::extended_header e2(uint16_t(255));
 	std::string p2 = prepare_header(h2, e2);
 	uint8_t s2[4] = {0x81, 0x7E, 0x00, 0xFF};
-	
+
 	BOOST_CHECK( p2.size() == 4);
 	BOOST_CHECK( std::equal(p2.begin(),p2.end(),reinterpret_cast<char*>(s2)) );
 }
 
 BOOST_AUTO_TEST_CASE( prepare_masking_key ) {
 	frame::masking_key_type key;
-	
+
 	key.i = htonl(0x12345678);
 
 	if (sizeof(size_t) == 8) {
 		BOOST_CHECK(
-			frame::prepare_masking_key(key) == lib::net::htonll(0x1234567812345678)
+			frame::prepare_masking_key(key) == lib::net::htonll(0x1234567812345678LL)
 		);
 	} else {
 		BOOST_CHECK( frame::prepare_masking_key(key) == htonl(0x12345678) );
@@ -255,7 +255,7 @@ BOOST_AUTO_TEST_CASE( prepare_masking_key2 ) {
 	// One call
 	if (sizeof(size_t) == 8) {
 		BOOST_CHECK(
-			frame::prepare_masking_key(key) == lib::net::htonll(0xD5FB70EED5FB70EE)
+			frame::prepare_masking_key(key) == lib::net::htonll(0xD5FB70EED5FB70EELL)
 		);
 	} else {
 		BOOST_CHECK( frame::prepare_masking_key(key) == htonl(0xD5FB70EE) );
@@ -266,14 +266,14 @@ BOOST_AUTO_TEST_CASE( prepare_masking_key2 ) {
 BOOST_AUTO_TEST_CASE( circshift ) {
     /*if (sizeof(size_t) == 8) {
         size_t test = 0x0123456789abcdef;
-        
+
         BOOST_CHECK( frame::circshift_prepared_key(test,0) == 0x0123456789abcdef);
         BOOST_CHECK( frame::circshift_prepared_key(test,1) == 0xef0123456789abcd);
         BOOST_CHECK( frame::circshift_prepared_key(test,2) == 0xcdef0123456789ab);
         BOOST_CHECK( frame::circshift_prepared_key(test,3) == 0xabcdef0123456789);
     } else {
         size_t test = 0x01234567;
-        
+
         BOOST_CHECK( frame::circshift_prepared_key(test,0) == 0x01234567);
         BOOST_CHECK( frame::circshift_prepared_key(test,1) == 0x67012345);
         BOOST_CHECK( frame::circshift_prepared_key(test,2) == 0x45670123);
@@ -282,13 +282,13 @@ BOOST_AUTO_TEST_CASE( circshift ) {
 }
 
 BOOST_AUTO_TEST_CASE( block_byte_mask ) {
-	uint8_t input[15] = {0x00, 0x00, 0x00, 0x00, 
+	uint8_t input[15] = {0x00, 0x00, 0x00, 0x00,
 		                 0x00, 0x00, 0x00, 0x00,
                          0x00, 0x00, 0x00, 0x00,
                          0x00, 0x00, 0x00};
-	
+
 	uint8_t output[15];
-	
+
 	uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -299,18 +299,18 @@ BOOST_AUTO_TEST_CASE( block_byte_mask ) {
 	key.c[1] = 0x01;
 	key.c[2] = 0x02;
 	key.c[3] = 0x03;
-	
+
 	byte_mask(input,input+15,output,key);
-	
+
 	BOOST_CHECK( std::equal(output,output+15,masked) );
 }
 
 BOOST_AUTO_TEST_CASE( block_byte_mask_inplace ) {
-	uint8_t buffer[15] = {0x00, 0x00, 0x00, 0x00, 
+	uint8_t buffer[15] = {0x00, 0x00, 0x00, 0x00,
 		                  0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00};
-	
+
 	uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -321,20 +321,20 @@ BOOST_AUTO_TEST_CASE( block_byte_mask_inplace ) {
 	key.c[1] = 0x01;
 	key.c[2] = 0x02;
 	key.c[3] = 0x03;
-	
+
 	byte_mask(buffer,buffer+15,key);
 
 	BOOST_CHECK( std::equal(buffer,buffer+15,masked) );
 }
 
 BOOST_AUTO_TEST_CASE( block_word_mask ) {
-	uint8_t input[15] =  {0x00, 0x00, 0x00, 0x00, 
+	uint8_t input[15] =  {0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00};
-	
+
 	uint8_t output[15];
-	
+
 	uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -345,18 +345,18 @@ BOOST_AUTO_TEST_CASE( block_word_mask ) {
 	key.c[1] = 0x01;
 	key.c[2] = 0x02;
 	key.c[3] = 0x03;
-	
+
 	word_mask_exact(input,output,15,key);
 
 	BOOST_CHECK( std::equal(output,output+15,masked) );
 }
 
 BOOST_AUTO_TEST_CASE( block_word_mask_inplace ) {
-	uint8_t buffer[15] = {0x00, 0x00, 0x00, 0x00, 
+	uint8_t buffer[15] = {0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00};
-	
+
 	uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -367,7 +367,7 @@ BOOST_AUTO_TEST_CASE( block_word_mask_inplace ) {
 	key.c[1] = 0x01;
 	key.c[2] = 0x02;
 	key.c[3] = 0x03;
-	
+
 	word_mask_exact(buffer,15,key);
 
 	BOOST_CHECK( std::equal(buffer,buffer+15,masked) );
@@ -376,7 +376,7 @@ BOOST_AUTO_TEST_CASE( block_word_mask_inplace ) {
 BOOST_AUTO_TEST_CASE( continuous_word_mask ) {
 	uint8_t input[16];
 	uint8_t output[16];
-	
+
 	uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -400,7 +400,7 @@ BOOST_AUTO_TEST_CASE( continuous_word_mask ) {
 	pkey = frame::prepare_masking_key(key);
 	std::fill_n(input,16,0x00);
 	std::fill_n(output,16,0x00);
-	
+
 	pkey_temp = frame::word_mask_circ(input,output,7,pkey);
 	BOOST_CHECK( std::equal(output,output+7,masked) );
 	BOOST_CHECK( pkey_temp == frame::circshift_prepared_key(pkey,3) );
@@ -410,9 +410,46 @@ BOOST_AUTO_TEST_CASE( continuous_word_mask ) {
 	BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
 }
 
+BOOST_AUTO_TEST_CASE( continuous_byte_mask ) {
+	uint8_t input[16];
+	uint8_t output[16];
+
+	uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x00};
+
+	frame::masking_key_type key;
+	key.c[0] = 0x00;
+	key.c[1] = 0x01;
+	key.c[2] = 0x02;
+	key.c[3] = 0x03;
+
+	// One call
+	size_t pkey,pkey_temp;
+	pkey = frame::prepare_masking_key(key);
+	std::fill_n(input,16,0x00);
+	std::fill_n(output,16,0x00);
+	frame::byte_mask_circ(input,output,15,pkey);
+	BOOST_CHECK( std::equal(output,output+16,masked) );
+
+	// calls not split on word boundaries
+	pkey = frame::prepare_masking_key(key);
+	std::fill_n(input,16,0x00);
+	std::fill_n(output,16,0x00);
+
+	pkey_temp = frame::byte_mask_circ(input,output,7,pkey);
+	BOOST_CHECK( std::equal(output,output+7,masked) );
+	BOOST_CHECK( pkey_temp == frame::circshift_prepared_key(pkey,3) );
+
+	pkey_temp = frame::byte_mask_circ(input+7,output+7,8,pkey_temp);
+	BOOST_CHECK( std::equal(output,output+16,masked) );
+	BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
+}
+
 BOOST_AUTO_TEST_CASE( continuous_word_mask_inplace ) {
 	uint8_t buffer[16];
-	
+
 	uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -434,7 +471,7 @@ BOOST_AUTO_TEST_CASE( continuous_word_mask_inplace ) {
 	// calls not split on word boundaries
 	pkey = frame::prepare_masking_key(key);
 	std::fill_n(buffer,16,0x00);
-	
+
 	pkey_temp = frame::word_mask_circ(buffer,7,pkey);
 	BOOST_CHECK( std::equal(buffer,buffer+7,masked) );
 	BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
@@ -444,11 +481,45 @@ BOOST_AUTO_TEST_CASE( continuous_word_mask_inplace ) {
 	BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
 }
 
-BOOST_AUTO_TEST_CASE( continuous_word_mask2 ) {	
+BOOST_AUTO_TEST_CASE( continuous_byte_mask_inplace ) {
+	uint8_t buffer[16];
+
+	uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x00};
+
+	frame::masking_key_type key;
+	key.c[0] = 0x00;
+	key.c[1] = 0x01;
+	key.c[2] = 0x02;
+	key.c[3] = 0x03;
+
+	// One call
+	size_t pkey,pkey_temp;
+	pkey = frame::prepare_masking_key(key);
+	std::fill_n(buffer,16,0x00);
+	frame::byte_mask_circ(buffer,15,pkey);
+	BOOST_CHECK( std::equal(buffer,buffer+16,masked) );
+
+	// calls not split on word boundaries
+	pkey = frame::prepare_masking_key(key);
+	std::fill_n(buffer,16,0x00);
+
+	pkey_temp = frame::byte_mask_circ(buffer,7,pkey);
+	BOOST_CHECK( std::equal(buffer,buffer+7,masked) );
+	BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
+
+	pkey_temp = frame::byte_mask_circ(buffer+7,8,pkey_temp);
+	BOOST_CHECK( std::equal(buffer,buffer+16,masked) );
+	BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
+}
+
+BOOST_AUTO_TEST_CASE( continuous_word_mask2 ) {
 	uint8_t buffer[12] = {0xA6, 0x15, 0x97, 0xB9,
                           0x81, 0x50, 0xAC, 0xBA,
                           0x9C, 0x1C, 0x9F, 0xF4};
-                          
+
     uint8_t unmasked[12] = {0x48, 0x65, 0x6C, 0x6C,
                             0x6F, 0x20, 0x57, 0x6F,
                             0x72, 0x6C, 0x64, 0x21};

test/utility/sha1.cpp

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE sha1
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/sha1/sha1.hpp>
+#include <websocketpp/utilities.hpp>
+
+BOOST_AUTO_TEST_SUITE ( sha1 )
+
+BOOST_AUTO_TEST_CASE( sha1_test_a ) {
+    unsigned char hash[20];
+    unsigned char reference[20] = {0xa9, 0x99, 0x3e, 0x36, 0x47,
+                                   0x06, 0x81, 0x6a, 0xba, 0x3e,
+                                   0x25, 0x71, 0x78, 0x50, 0xc2,
+                                   0x6c, 0x9c, 0xd0, 0xd8, 0x9d};
+
+    websocketpp::sha1::calc("abc",3,hash);
+
+    BOOST_CHECK_EQUAL_COLLECTIONS(hash, hash+20, reference, reference+20);
+}
+
+BOOST_AUTO_TEST_CASE( sha1_test_b ) {
+    unsigned char hash[20];
+    unsigned char reference[20] = {0x84, 0x98, 0x3e, 0x44, 0x1c,
+                                   0x3b, 0xd2, 0x6e, 0xba, 0xae,
+                                   0x4a, 0xa1, 0xf9, 0x51, 0x29,
+                                   0xe5, 0xe5, 0x46, 0x70, 0xf1};
+
+    websocketpp::sha1::calc(
+        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",56,hash);
+
+    BOOST_CHECK_EQUAL_COLLECTIONS(hash, hash+20, reference, reference+20);
+}
+
+BOOST_AUTO_TEST_CASE( sha1_test_c ) {
+    std::string input;
+    unsigned char hash[20];
+    unsigned char reference[20] = {0x34, 0xaa, 0x97, 0x3c, 0xd4,
+                                   0xc4, 0xda, 0xa4, 0xf6, 0x1e,
+                                   0xeb, 0x2b, 0xdb, 0xad, 0x27,
+                                   0x31, 0x65, 0x34, 0x01, 0x6f};
+
+    for (int i = 0; i < 1000000; i++) {
+        input += 'a';
+    }
+
+    websocketpp::sha1::calc(input.c_str(),input.size(),hash);
+
+    BOOST_CHECK_EQUAL_COLLECTIONS(hash, hash+20, reference, reference+20);
+}
+
+BOOST_AUTO_TEST_SUITE_END()

test/utility/uri.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ * Copyright (c) 2013, Peter Thorson. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE uri
@@ -35,296 +35,212 @@
 
 // Test a regular valid ws URI
 BOOST_AUTO_TEST_CASE( uri_valid ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("ws://localhost:9000/chat");
-        
-        BOOST_CHECK( uri.get_secure() == false );
-        BOOST_CHECK( uri.get_host() == "localhost");
-        BOOST_CHECK( uri.get_port() == 9000 );
-        BOOST_CHECK( uri.get_resource() == "/chat" );
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("ws://localhost:9000/chat");
 
-    BOOST_CHECK( exception == false);
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( !uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "ws");
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
+    BOOST_CHECK_EQUAL( uri.get_query(), "" );
 }
 
 // Test a regular valid ws URI
 BOOST_AUTO_TEST_CASE( uri_valid_no_port_unsecure ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("ws://localhost/chat");
-        
-        BOOST_CHECK( uri.get_secure() == false );
-        BOOST_CHECK( uri.get_host() == "localhost");
-        BOOST_CHECK( uri.get_port() == 80 );
-        BOOST_CHECK( uri.get_resource() == "/chat" );
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("ws://localhost/chat");
 
-    BOOST_CHECK( exception == false);
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( !uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "ws");
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 80 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
 }
 
-
-
 // Valid URI with no port (secure)
 BOOST_AUTO_TEST_CASE( uri_valid_no_port_secure ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss://localhost/chat");
-        
-        BOOST_CHECK( uri.get_secure() == true );
-        BOOST_CHECK( uri.get_host() == "localhost");
-        BOOST_CHECK( uri.get_port() == 443 );
-        BOOST_CHECK( uri.get_resource() == "/chat" );
-    } catch (websocketpp::uri_exception& e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
+    websocketpp::uri uri("wss://localhost/chat");
 
-    BOOST_CHECK( exception == false);
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 443 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
 }
 
 // Valid URI with no resource
 BOOST_AUTO_TEST_CASE( uri_valid_no_resource ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss://localhost:9000");
-        
-        BOOST_CHECK( uri.get_secure() == true );
-        BOOST_CHECK( uri.get_host() == "localhost");
-        BOOST_CHECK( uri.get_port() == 9000 );
-        BOOST_CHECK( uri.get_resource() == "/" );       
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("wss://localhost:9000");
 
-    BOOST_CHECK( exception == false);
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
 }
 
 // Valid URI IPv6 Literal
 BOOST_AUTO_TEST_CASE( uri_valid_ipv6_literal ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss://[::1]:9000/chat");
-        
-        BOOST_CHECK( uri.get_secure() == true );
-        BOOST_CHECK( uri.get_host() == "::1");
-        BOOST_CHECK( uri.get_port() == 9000 );
-        BOOST_CHECK( uri.get_resource() == "/chat" );       
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("wss://[::1]:9000/chat");
 
-    BOOST_CHECK( exception == false);
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
+    BOOST_CHECK_EQUAL( uri.get_host(), "::1");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
 }
 
-
-
 // Valid URI with more complicated host
 BOOST_AUTO_TEST_CASE( uri_valid_2 ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss://thor-websocket.zaphoyd.net:88/");
-        
-        BOOST_CHECK( uri.get_secure() == true );
-        BOOST_CHECK( uri.get_host() == "thor-websocket.zaphoyd.net");
-        BOOST_CHECK( uri.get_port() == 88 );
-        BOOST_CHECK( uri.get_resource() == "/" );
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("wss://thor-websocket.zaphoyd.net:88/");
 
-    BOOST_CHECK( exception == false);
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
+    BOOST_CHECK_EQUAL( uri.get_host(), "thor-websocket.zaphoyd.net");
+    BOOST_CHECK_EQUAL( uri.get_port(), 88 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
 }
 
 
 // Invalid URI (port too long)
 BOOST_AUTO_TEST_CASE( uri_invalid_long_port ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss://localhost:900000/chat");        
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("wss://localhost:900000/chat");
 
-    BOOST_CHECK( exception == true);
+    BOOST_CHECK( !uri.get_valid() );
 }
 
 // Invalid URI (bogus scheme method)
 BOOST_AUTO_TEST_CASE( uri_invalid_scheme ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("foo://localhost:9000/chat");     
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("foo://localhost:9000/chat");
 
-    BOOST_CHECK( exception == true);
+    BOOST_CHECK( !uri.get_valid() );
 }
 
 // Valid URI (http method)
 BOOST_AUTO_TEST_CASE( uri_http_scheme ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("http://localhost:9000/chat");
-        
-        BOOST_CHECK( uri.get_secure() == false );
-        BOOST_CHECK( uri.get_host() == "localhost");
-        BOOST_CHECK( uri.get_port() == 9000 );
-        BOOST_CHECK( uri.get_resource() == "/chat" );     
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("http://localhost:9000/chat");
 
-    BOOST_CHECK( exception == false);
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( !uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "http");
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
 }
 
 // Valid URI IPv4 literal
 BOOST_AUTO_TEST_CASE( uri_valid_ipv4_literal ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss://127.0.0.1:9000/chat");
-        
-        BOOST_CHECK( uri.get_secure() == true );
-        BOOST_CHECK( uri.get_host() == "127.0.0.1");
-        BOOST_CHECK( uri.get_port() == 9000 );
-        BOOST_CHECK( uri.get_resource() == "/chat" );       
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("wss://127.0.0.1:9000/chat");
 
-    BOOST_CHECK( exception == false);
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
+    BOOST_CHECK_EQUAL( uri.get_host(), "127.0.0.1");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
 }
 
 // Valid URI complicated resource path
 BOOST_AUTO_TEST_CASE( uri_valid_3 ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss://localhost:9000/chat/foo/bar");
-        
-        BOOST_CHECK( uri.get_secure() == true );
-        BOOST_CHECK( uri.get_host() == "localhost");
-        BOOST_CHECK( uri.get_port() == 9000 );
-        BOOST_CHECK( uri.get_resource() == "/chat/foo/bar" );       
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("wss://localhost:9000/chat/foo/bar");
 
-    BOOST_CHECK( exception == false);
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat/foo/bar" );
 }
 
 // Invalid URI broken method separator
 BOOST_AUTO_TEST_CASE( uri_invalid_method_separator ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss:/localhost:9000/chat");       
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("wss:/localhost:9000/chat");
 
-    BOOST_CHECK( exception == true);
+    BOOST_CHECK( !uri.get_valid() );
 }
 
 // Invalid URI port > 65535
 BOOST_AUTO_TEST_CASE( uri_invalid_gt_16_bit_port ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss:/localhost:70000/chat");      
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("wss:/localhost:70000/chat");
 
-    BOOST_CHECK( exception == true);
+    BOOST_CHECK( !uri.get_valid() );
 }
 
 // Invalid URI includes uri fragment
 BOOST_AUTO_TEST_CASE( uri_invalid_fragment ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss:/localhost:70000/chat#foo");      
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("wss:/localhost:70000/chat#foo");
 
-    BOOST_CHECK( exception == true);
+    BOOST_CHECK( !uri.get_valid() );
 }
 
 // Invalid URI with no brackets around IPv6 literal
 BOOST_AUTO_TEST_CASE( uri_invalid_bad_v6_literal_1 ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss://::1/chat");     
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
-    
-    BOOST_CHECK( exception == true);
+    websocketpp::uri uri("wss://::1/chat");
+
+    BOOST_CHECK( !uri.get_valid() );
 }
 
-// Invalid URI with port and no brackets around IPv6 literal 
+// Invalid URI with port and no brackets around IPv6 literal
 BOOST_AUTO_TEST_CASE( uri_invalid_bad_v6_literal_2 ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss://::1:2009/chat");        
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
-    
-    BOOST_CHECK( exception == true);
+    websocketpp::uri uri("wss://::1:2009/chat");
+
+    BOOST_CHECK( !uri.get_valid() );
 }
 
 // Valid URI complicated resource path with query
 BOOST_AUTO_TEST_CASE( uri_valid_4 ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss://localhost:9000/chat/foo/bar?foo=bar");
-        
-        BOOST_CHECK( uri.get_secure() == true );
-        BOOST_CHECK( uri.get_host() == "localhost");
-        BOOST_CHECK( uri.get_port() == 9000 );
-        BOOST_CHECK( uri.get_resource() == "/chat/foo/bar?foo=bar" );       
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
+    websocketpp::uri uri("wss://localhost:9000/chat/foo/bar?foo=bar");
 
-    BOOST_CHECK( exception == false);
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss" );
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat/foo/bar?foo=bar" );
+    BOOST_CHECK_EQUAL( uri.get_query(), "foo=bar" );
 }
 
 // Valid URI with a mapped v4 ipv6 literal
 BOOST_AUTO_TEST_CASE( uri_valid_v4_mapped ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss://[0000:0000:0000:0000:0000:0000:192.168.1.1]:9000/");
-        
-        BOOST_CHECK( uri.get_secure() == true );
-        BOOST_CHECK( uri.get_host() == "0000:0000:0000:0000:0000:0000:192.168.1.1");
-        BOOST_CHECK( uri.get_port() == 9000 );
-        BOOST_CHECK( uri.get_resource() == "/" );       
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
-    
-    BOOST_CHECK( exception == false);
+    websocketpp::uri uri("wss://[0000:0000:0000:0000:0000:0000:192.168.1.1]:9000/");
+
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss" );
+    BOOST_CHECK_EQUAL( uri.get_host(), "0000:0000:0000:0000:0000:0000:192.168.1.1");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
 }
 
 // Valid URI with a v6 address with mixed case
 BOOST_AUTO_TEST_CASE( uri_valid_v6_mixed_case ) {
-    bool exception = false;
-    try {
-        websocketpp::uri uri("wss://[::10aB]:9000/");
-        
-        BOOST_CHECK( uri.get_secure() == true );
-        BOOST_CHECK( uri.get_host() == "::10aB");
-        BOOST_CHECK( uri.get_port() == 9000 );
-        BOOST_CHECK( uri.get_resource() == "/" );       
-    } catch (websocketpp::uri_exception&) {
-        exception = true;
-    }
-    
-    BOOST_CHECK( exception == false);
+    websocketpp::uri uri("wss://[::10aB]:9000/");
+
+    BOOST_CHECK( uri.get_valid() == true );
+    BOOST_CHECK( uri.get_secure() == true );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss" );
+    BOOST_CHECK_EQUAL( uri.get_host(), "::10aB");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
 }
 
-// TODO: tests for the other two constructors
+// Valid URI with a v6 address with mixed case
+BOOST_AUTO_TEST_CASE( uri_invalid_no_scheme ) {
+    websocketpp::uri uri("myserver.com");
+
+    BOOST_CHECK( !uri.get_valid() );
+}
+
+// Invalid IPv6 literal
+/*BOOST_AUTO_TEST_CASE( uri_invalid_v6_nonhex ) {
+    websocketpp::uri uri("wss://[g::1]:9000/");
+
+    BOOST_CHECK( uri.get_valid() == false );
+}*/
+
+// TODO: tests for the other two constructors

test/utility/utilities.cpp

@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE utility
@@ -38,28 +38,34 @@ BOOST_AUTO_TEST_SUITE ( utility )
 BOOST_AUTO_TEST_CASE( substr_found ) {
     std::string haystack = "abc123";
     std::string needle = "abc";
-    
+
     BOOST_CHECK(websocketpp::utility::ci_find_substr(haystack,needle) ==haystack.begin());
 }
 
 BOOST_AUTO_TEST_CASE( substr_found_ci ) {
     std::string haystack = "abc123";
     std::string needle = "aBc";
-    
+
     BOOST_CHECK(websocketpp::utility::ci_find_substr(haystack,needle) ==haystack.begin());
 }
 
 BOOST_AUTO_TEST_CASE( substr_not_found ) {
     std::string haystack = "abd123";
     std::string needle = "abcd";
-    
+
     BOOST_CHECK(websocketpp::utility::ci_find_substr(haystack,needle) == haystack.end());
 }
 
+BOOST_AUTO_TEST_CASE( to_lower ) {
+    std::string in = "AbCd";
+
+    BOOST_CHECK_EQUAL(websocketpp::utility::to_lower(in), "abcd");
+}
+
 BOOST_AUTO_TEST_CASE( string_replace_all ) {
     std::string source = "foo \"bar\" baz";
     std::string dest = "foo \\\"bar\\\" baz";
-    
+
     using websocketpp::utility::string_replace_all;
     BOOST_CHECK_EQUAL(string_replace_all(source,"\"","\\\""),dest);
 }

tutorials/broadcast_tutorial/broadcast_tutorial.md

@@ -0,0 +1,17 @@
+Broadcast Tutorial
+==================
+
+This tutorial will dig into some more nitty gritty details on how to build high
+scalability, high performance websocket servers for broadcast like workflows.
+
+Will go into features like:
+- minimizing work done in handlers
+- using asio thread pool mode
+- teaming multiple endpoints
+- setting accept queue depth
+- tuning compile time buffer sizes
+- prepared messages
+- flow control
+- basic operating system level tuning, particularly increasing file descriptor limits.
+- measuring performance with wsperf / autobahn
+- tuning permessage-deflate compression settings

tutorials/chat_tutorial/chat_tutorial.md

@@ -0,0 +1,13 @@
+Chat Tutorial
+=============
+
+Goals of this tutorial:
+- Impliment a realtime websocket chat server
+
+
+Server
+- Nicknames
+- Channels
+- Subprotocol
+- Origin restrictions
+- HTTP statistics page

tutorials/utility_client/step1.cpp

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
+
+#include <iostream>
+#include <string>
+
+int main() {
+    bool done = false;
+    std::string input;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout 
+                << "\nCommand List:\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else {
+            std::cout << "Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}

tutorials/utility_client/step2.cpp

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <iostream>
+#include <string>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+int main() {
+    bool done = false;
+    std::string input;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else {
+            std::cout << "Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}

tutorials/utility_client/step3.cpp

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <websocketpp/common/thread.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <iostream>
+#include <string>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+class websocket_endpoint {
+public:
+    websocket_endpoint () {
+        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
+
+        m_endpoint.init_asio();
+        m_endpoint.start_perpetual();
+
+        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
+    }
+private:
+    client m_endpoint;
+    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
+};
+
+int main() {
+    bool done = false;
+    std::string input;
+    websocket_endpoint endpoint;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout 
+                << "\nCommand List:\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else {
+            std::cout << "Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}

tutorials/utility_client/step4.cpp

@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <websocketpp/common/thread.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <cstdlib>
+#include <iostream>
+#include <map>
+#include <string>
+#include <sstream>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+class connection_metadata {
+public:
+    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
+
+    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
+      : m_id(id)
+      , m_hdl(hdl)
+      , m_status("Connecting")
+      , m_uri(uri)
+      , m_server("N/A")
+    {}
+
+    void on_open(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Open";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+    }
+
+    void on_fail(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Failed";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+        m_error_reason = con->get_ec().message();
+    }
+
+    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
+private:
+    int m_id;
+    websocketpp::connection_hdl m_hdl;
+    std::string m_status;
+    std::string m_uri;
+    std::string m_server;
+    std::string m_error_reason;
+};
+
+std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
+    out << "> URI: " << data.m_uri << "\n"
+        << "> Status: " << data.m_status << "\n"
+        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
+        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason);
+
+    return out;
+}
+
+class websocket_endpoint {
+public:
+    websocket_endpoint () : m_next_id(0) {
+        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
+
+        m_endpoint.init_asio();
+        m_endpoint.start_perpetual();
+
+        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
+    }
+
+    int connect(std::string const & uri) {
+        websocketpp::lib::error_code ec;
+
+        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
+
+        if (ec) {
+            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
+            return -1;
+        }
+
+        int new_id = m_next_id++;
+        connection_metadata::ptr metadata_ptr(new connection_metadata(new_id, con->get_handle(), uri));
+        m_connection_list[new_id] = metadata_ptr;
+
+        con->set_open_handler(websocketpp::lib::bind(
+            &connection_metadata::on_open,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_fail_handler(websocketpp::lib::bind(
+            &connection_metadata::on_fail,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+
+        m_endpoint.connect(con);
+
+        return new_id;
+    }
+
+    connection_metadata::ptr get_metadata(int id) const {
+        con_list::const_iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            return connection_metadata::ptr();
+        } else {
+            return metadata_it->second;
+        }
+    }
+private:
+    typedef std::map<int,connection_metadata::ptr> con_list;
+
+    client m_endpoint;
+    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
+
+    con_list m_connection_list;
+    int m_next_id;
+};
+
+int main() {
+    bool done = false;
+    std::string input;
+    websocket_endpoint endpoint;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "connect <ws uri>\n"
+                << "show <connection id>\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else if (input.substr(0,7) == "connect") {
+            int id = endpoint.connect(input.substr(8));
+            if (id != -1) {
+                std::cout << "> Created connection with id " << id << std::endl;
+            }
+        } else if (input.substr(0,4) == "show") {
+            int id = atoi(input.substr(5).c_str());
+
+            connection_metadata::ptr metadata = endpoint.get_metadata(id);
+            if (metadata) {
+                std::cout << *metadata << std::endl;
+            } else {
+                std::cout << "> Unknown connection id " << id << std::endl;
+            }
+        } else {
+            std::cout << "> Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
+
+/*
+
+clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a
+
+clang++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_thread.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_random.a
+
+clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/Documents/websocketpp/ -I/Users/zaphoyd/Documents/boost_1_53_0_libcpp/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/Documents/boost_1_53_0_libcpp/stage/lib/libboost_system.a
+
+*/

tutorials/utility_client/step5.cpp

@@ -0,0 +1,280 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <websocketpp/common/thread.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <cstdlib>
+#include <iostream>
+#include <map>
+#include <string>
+#include <sstream>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+class connection_metadata {
+public:
+    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
+
+    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
+      : m_id(id)
+      , m_hdl(hdl)
+      , m_status("Connecting")
+      , m_uri(uri)
+      , m_server("N/A")
+    {}
+
+    void on_open(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Open";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+    }
+
+    void on_fail(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Failed";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+        m_error_reason = con->get_ec().message();
+    }
+    
+    void on_close(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Closed";
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        std::stringstream s;
+        s << "close code: " << con->get_remote_close_code() << " (" 
+          << websocketpp::close::status::get_string(con->get_remote_close_code()) 
+          << "), close reason: " << con->get_remote_close_reason();
+        m_error_reason = s.str();
+    }
+
+    websocketpp::connection_hdl get_hdl() const {
+        return m_hdl;
+    }
+    
+    int get_id() const {
+        return m_id;
+    }
+    
+    std::string get_status() const {
+        return m_status;
+    }
+
+    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
+private:
+    int m_id;
+    websocketpp::connection_hdl m_hdl;
+    std::string m_status;
+    std::string m_uri;
+    std::string m_server;
+    std::string m_error_reason;
+};
+
+std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
+    out << "> URI: " << data.m_uri << "\n"
+        << "> Status: " << data.m_status << "\n"
+        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
+        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason);
+
+    return out;
+}
+
+class websocket_endpoint {
+public:
+    websocket_endpoint () : m_next_id(0) {
+        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
+
+        m_endpoint.init_asio();
+        m_endpoint.start_perpetual();
+
+        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
+    }
+
+    ~websocket_endpoint() {
+        m_endpoint.stop_perpetual();
+        
+        for (con_list::const_iterator it = m_connection_list.begin(); it != m_connection_list.end(); ++it) {
+            if (it->second->get_status() != "Open") {
+                // Only close open connections
+                continue;
+            }
+            
+            std::cout << "> Closing connection " << it->second->get_id() << std::endl;
+            
+            websocketpp::lib::error_code ec;
+            m_endpoint.close(it->second->get_hdl(), websocketpp::close::status::going_away, "", ec);
+            if (ec) {
+                std::cout << "> Error closing connection " << it->second->get_id() << ": "  
+                          << ec.message() << std::endl;
+            }
+        }
+        
+        m_thread->join();
+    }
+
+    int connect(std::string const & uri) {
+        websocketpp::lib::error_code ec;
+
+        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
+
+        if (ec) {
+            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
+            return -1;
+        }
+
+        int new_id = m_next_id++;
+        connection_metadata::ptr metadata_ptr(new connection_metadata(new_id, con->get_handle(), uri));
+        m_connection_list[new_id] = metadata_ptr;
+
+        con->set_open_handler(websocketpp::lib::bind(
+            &connection_metadata::on_open,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_fail_handler(websocketpp::lib::bind(
+            &connection_metadata::on_fail,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_close_handler(websocketpp::lib::bind(
+            &connection_metadata::on_close,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+
+        m_endpoint.connect(con);
+
+        return new_id;
+    }
+
+    void close(int id, websocketpp::close::status::value code, std::string reason) {
+        websocketpp::lib::error_code ec;
+        
+        con_list::iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            std::cout << "> No connection found with id " << id << std::endl;
+            return;
+        }
+        
+        m_endpoint.close(metadata_it->second->get_hdl(), code, reason, ec);
+        if (ec) {
+            std::cout << "> Error initiating close: " << ec.message() << std::endl;
+        }
+    }
+
+    connection_metadata::ptr get_metadata(int id) const {
+        con_list::const_iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            return connection_metadata::ptr();
+        } else {
+            return metadata_it->second;
+        }
+    }
+private:
+    typedef std::map<int,connection_metadata::ptr> con_list;
+
+    client m_endpoint;
+    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
+
+    con_list m_connection_list;
+    int m_next_id;
+};
+
+int main() {
+    bool done = false;
+    std::string input;
+    websocket_endpoint endpoint;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "connect <ws uri>\n"
+                << "close <connection id> [<close code:default=1000>] [<close reason>]\n"
+                << "show <connection id>\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else if (input.substr(0,7) == "connect") {
+            int id = endpoint.connect(input.substr(8));
+            if (id != -1) {
+                std::cout << "> Created connection with id " << id << std::endl;
+            }
+        } else if (input.substr(0,5) == "close") {
+            std::stringstream ss(input);
+            
+            std::string cmd;
+            int id;
+            int close_code = websocketpp::close::status::normal;
+            std::string reason = "";
+            
+            ss >> cmd >> id >> close_code;
+            std::getline(ss,reason);
+            
+            endpoint.close(id, close_code, reason);
+        }  else if (input.substr(0,4) == "show") {
+            int id = atoi(input.substr(5).c_str());
+
+            connection_metadata::ptr metadata = endpoint.get_metadata(id);
+            if (metadata) {
+                std::cout << *metadata << std::endl;
+            } else {
+                std::cout << "> Unknown connection id " << id << std::endl;
+            }
+        } else {
+            std::cout << "> Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
+
+/*
+
+clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a
+
+clang++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_thread.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_random.a
+
+clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/Documents/websocketpp/ -I/Users/zaphoyd/Documents/boost_1_53_0_libcpp/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/Documents/boost_1_53_0_libcpp/stage/lib/libboost_system.a
+
+*/