Hello community, here is the log from the commit of package websocketpp for openSUSE:Factory checked in at 2019-04-02 09:23:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/websocketpp (Old) and /work/SRC/openSUSE:Factory/.websocketpp.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "websocketpp" Tue Apr 2 09:23:12 2019 rev:8 rq:690388 version:0.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/websocketpp/websocketpp.changes 2018-07-28 12:44:06.340848576 +0200 +++ /work/SRC/openSUSE:Factory/.websocketpp.new.25356/websocketpp.changes 2019-04-02 09:23:14.724747758 +0200 @@ -1,0 +2,12 @@ +Thu Mar 28 15:30:30 UTC 2019 - manuel <[email protected]> + +- updated to version 0.8.1 (boo#1130861) + + This is a bug fix patch to fix a major test suite regression + introduced in 0.8.0 and adjust installation behavior to make + downstream packaging easier. + + Note: There are no changes to the library itself, only to the + test and installation systems. + +------------------------------------------------------------------- Old: ---- websocketpp-0.8.0.tar.gz New: ---- websocketpp-0.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ websocketpp.spec ++++++ --- /var/tmp/diff_new_pack.pyGoNY/_old 2019-04-02 09:23:15.112748019 +0200 +++ /var/tmp/diff_new_pack.pyGoNY/_new 2019-04-02 09:23:15.116748021 +0200 @@ -1,7 +1,7 @@ # # spec file for package websocketpp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: websocketpp -Version: 0.8.0 +Version: 0.8.1 Release: 0 Summary: C++ WebSocket Protocol Library License: BSD-3-Clause ++++++ websocketpp-0.8.0.tar.gz -> websocketpp-0.8.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/Doxyfile new/websocketpp-0.8.1/Doxyfile --- old/websocketpp-0.8.0/Doxyfile 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/Doxyfile 2018-07-16 14:40:53.000000000 +0200 @@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.8.0 +PROJECT_NUMBER = 0.8.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/changelog.md new/websocketpp-0.8.1/changelog.md --- old/websocketpp-0.8.0/changelog.md 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/changelog.md 2018-07-16 14:40:53.000000000 +0200 @@ -1,5 +1,13 @@ HEAD +0.8.1 - 2018-07-16 +Note: This release does not change library behavior. It only corrects issues +in the installer and test system. +- Test Suite: Adjust test suite to match behavior introduced in 0.8.0. Thank + you Gianfranco Costamagna for reporting and a patch. #731 +- CMake: Update cmake installer to only install library files globally. + Thank you Gianfraco Costamanga for reporting and a patch. #732 + 0.8.0 - 2018-07-12 - Examples: Add `print_client` example. This demonstrates a minimal non-TLS client that connects to a server and prints out the messages it receives. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/cmake/CMakeHelpers.cmake new/websocketpp-0.8.1/cmake/CMakeHelpers.cmake --- old/websocketpp-0.8.0/cmake/CMakeHelpers.cmake 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/cmake/CMakeHelpers.cmake 2018-07-16 14:40:53.000000000 +0200 @@ -79,12 +79,9 @@ CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES}) endif () - # install headers, directly from current source dir and look for subfolders with headers - file (GLOB_RECURSE TARGET_INSTALL_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.hpp) - foreach (hppfile ${TARGET_INSTALL_HEADERS}) - get_filename_component (currdir ${hppfile} PATH) - install (FILES ${hppfile} DESTINATION "include/${TARGET_NAME}/${currdir}") - endforeach() + install (DIRECTORY ${CMAKE_SOURCE_DIR}/${TARGET_NAME} + DESTINATION include/ + FILES_MATCHING PATTERN "*.hpp*") endmacro () macro (link_boost) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/examples/dev/main.cpp new/websocketpp-0.8.1/examples/dev/main.cpp --- old/websocketpp-0.8.0/examples/dev/main.cpp 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/examples/dev/main.cpp 2018-07-16 14:40:53.000000000 +0200 @@ -179,7 +179,7 @@ //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\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; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/readme.md new/websocketpp-0.8.1/readme.md --- old/websocketpp-0.8.0/readme.md 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/readme.md 2018-07-16 14:40:53.000000000 +0200 @@ -1,4 +1,4 @@ -WebSocket++ (0.8.0) +WebSocket++ (0.8.1) ========================== WebSocket++ is a header only C++ library that implements RFC6455 The WebSocket diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/test/connection/connection.cpp new/websocketpp-0.8.1/test/connection/connection.cpp --- old/websocketpp-0.8.0/test/connection/connection.cpp 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/test/connection/connection.cpp 2018-07-16 14:40:53.000000000 +0200 @@ -217,8 +217,8 @@ } 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: "; + 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: "; output+=websocketpp::user_agent; output+="\r\nUpgrade: websocket\r\n\r\n"; @@ -279,8 +279,8 @@ } 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"; + 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(""); @@ -290,8 +290,8 @@ } 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"; + 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(""); @@ -304,7 +304,7 @@ 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 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"; @@ -326,13 +326,13 @@ } 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"; + 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"; + 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. @@ -361,7 +361,7 @@ } BOOST_AUTO_TEST_CASE( websocket_fail_invalid_version ) { - std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: foo\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";; + std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: foo\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";; server s; websocketpp::lib::error_code ec = make_error_code(websocketpp::error::invalid_version); @@ -373,7 +373,7 @@ } BOOST_AUTO_TEST_CASE( websocket_fail_unsupported_version ) { - std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 12\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";; + std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 12\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";; server s; websocketpp::lib::error_code ec = make_error_code(websocketpp::error::unsupported_version); @@ -385,7 +385,7 @@ } // BOOST_AUTO_TEST_CASE( websocket_fail_invalid_uri ) { -// std::string input = "GET http://345.123.123.123/foo 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 input = "GET http://345.123.123.123/foo 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";; // server s; // websocketpp::lib::error_code ec = make_error_code(websocketpp::error::unsupported_version); @@ -429,14 +429,14 @@ // 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 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";; +// 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); @@ -481,7 +481,7 @@ BOOST_CHECK(!ec); - std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: ICX+Yqv66kxgM0FcWaLWlFLwTAI=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n"; + std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: ICX+Yqv66kxgM0FcWaLWlFLwTAI=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n"; // This test the case where a handshake times out immediately before the // handler that would have completed it gets invoked. This situation happens @@ -501,7 +501,7 @@ BOOST_AUTO_TEST_CASE( server_handshake_timeout_race1 ) { debug_server s; - 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: AAAAAAAAAAAAAAAAAAAAAA==\r\n\r\n"; + 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: AAAAAAAAAAAAAAAAAAAAAA==\r\n\r\n"; debug_server::connection_ptr con = s.get_connection(); con->start(); @@ -516,7 +516,7 @@ BOOST_AUTO_TEST_CASE( server_handshake_timeout_race2 ) { debug_server s; - 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: AAAAAAAAAAAAAAAAAAAAAA==\r\n\r\n"; + 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: AAAAAAAAAAAAAAAAAAAAAA==\r\n\r\n"; debug_server::connection_ptr con = s.get_connection(); con->start(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/test/message_buffer/pool.cpp new/websocketpp-0.8.1/test/message_buffer/pool.cpp --- old/websocketpp-0.8.0/test/message_buffer/pool.cpp 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/test/message_buffer/pool.cpp 2018-07-16 14:40:53.000000000 +0200 @@ -41,7 +41,7 @@ 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"; + 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"); @@ -79,7 +79,7 @@ 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"; + 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!"); @@ -93,7 +93,7 @@ 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"; + 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!"); @@ -107,7 +107,7 @@ 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"; + 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!"); @@ -121,7 +121,7 @@ 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"; + 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!"); @@ -137,7 +137,7 @@ 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"; + 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!"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/test/processors/hybi00.cpp new/websocketpp-0.8.1/test/processors/hybi00.cpp --- old/websocketpp-0.8.0/test/processors/hybi00.cpp 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/test/processors/hybi00.cpp 2018-07-16 14:40:53.000000000 +0200 @@ -66,7 +66,7 @@ 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"; + 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"); @@ -98,7 +98,7 @@ 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"; + 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!"); @@ -111,7 +111,7 @@ 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"; + 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!"); @@ -124,7 +124,7 @@ 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"; + 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!"); @@ -137,7 +137,7 @@ 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"; + 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!"); @@ -151,7 +151,7 @@ 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"; + 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!"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/test/processors/hybi07.cpp new/websocketpp-0.8.1/test/processors/hybi07.cpp --- old/websocketpp-0.8.0/test/processors/hybi07.cpp 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/test/processors/hybi07.cpp 2018-07-16 14:40:53.000000000 +0200 @@ -74,7 +74,7 @@ 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"; + 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()); @@ -95,7 +95,7 @@ p.process_handshake(r,"",response); - BOOST_CHECK_EQUAL(response.get_header("Connection"), "upgrade"); + 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="); } @@ -108,7 +108,7 @@ websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng); 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"; + 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()); @@ -126,7 +126,7 @@ 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"; + 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()); @@ -144,7 +144,7 @@ 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"; + 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()); @@ -162,7 +162,7 @@ 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"; + 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()); @@ -180,7 +180,7 @@ 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:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: foo\r\n\r\n"; + 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()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/test/processors/hybi08.cpp new/websocketpp-0.8.1/test/processors/hybi08.cpp --- old/websocketpp-0.8.0/test/processors/hybi08.cpp 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/test/processors/hybi08.cpp 2018-07-16 14:40:53.000000000 +0200 @@ -74,7 +74,7 @@ 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"; + 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()); @@ -95,7 +95,7 @@ p.process_handshake(r,"",response); - BOOST_CHECK(response.get_header("Connection") == "upgrade"); + BOOST_CHECK(response.get_header("Connection") == "Upgrade"); BOOST_CHECK(response.get_header("Upgrade") == "websocket"); BOOST_CHECK(response.get_header("Sec-WebSocket-Accept") == "s3pPLMBiTxaQ9kYGzzhZRbK+xOo="); } @@ -108,7 +108,7 @@ websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng); 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"; + 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()); @@ -126,7 +126,7 @@ 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"; + 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()); @@ -144,7 +144,7 @@ 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"; + 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()); @@ -162,7 +162,7 @@ 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"; + 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()); @@ -181,7 +181,7 @@ websocketpp::uri_ptr u; 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"; + 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()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/test/processors/hybi13.cpp new/websocketpp-0.8.1/test/processors/hybi13.cpp --- old/websocketpp-0.8.0/test/processors/hybi13.cpp 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/test/processors/hybi13.cpp 2018-07-16 14:40:53.000000000 +0200 @@ -120,7 +120,7 @@ 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"; + 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()); @@ -139,7 +139,7 @@ env.p.process_handshake(env.req,"",env.res); - BOOST_CHECK_EQUAL(env.res.get_header("Connection"), "upgrade"); + 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="); } @@ -147,7 +147,7 @@ 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"; + 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()); @@ -159,7 +159,7 @@ 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"; + 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()); @@ -171,7 +171,7 @@ 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"; + 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()); @@ -183,7 +183,7 @@ 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"; + 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()); @@ -195,7 +195,7 @@ 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"; + 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()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/test/processors/processor.cpp new/websocketpp-0.8.1/test/processors/processor.cpp --- old/websocketpp-0.8.0/test/processors/processor.cpp 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/test/processors/processor.cpp 2018-07-16 14:40:53.000000000 +0200 @@ -37,7 +37,7 @@ 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"; + 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()); @@ -67,7 +67,7 @@ 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"; + 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()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/test/roles/server.cpp new/websocketpp-0.8.1/test/roles/server.cpp --- old/websocketpp-0.8.0/test/roles/server.cpp 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/test/roles/server.cpp 2018-07-16 14:40:53.000000000 +0200 @@ -118,8 +118,8 @@ /* Tests */ 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"; + 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"); @@ -128,7 +128,7 @@ } 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 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; @@ -139,7 +139,7 @@ } 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 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"; @@ -150,9 +150,9 @@ } 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 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 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; @@ -165,9 +165,9 @@ } 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 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 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; @@ -183,9 +183,9 @@ } 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 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 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; @@ -201,9 +201,9 @@ } 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 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 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; @@ -219,9 +219,9 @@ } 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 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 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; @@ -237,7 +237,7 @@ } /*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 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; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/test/transport/integration.cpp new/websocketpp-0.8.1/test/transport/integration.cpp --- old/websocketpp-0.8.0/test/transport/integration.cpp 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/test/transport/integration.cpp 2018-07-16 14:40:53.000000000 +0200 @@ -610,7 +610,7 @@ 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"; + 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocketpp-0.8.0/websocketpp/version.hpp new/websocketpp-0.8.1/websocketpp/version.hpp --- old/websocketpp-0.8.0/websocketpp/version.hpp 2018-07-12 14:50:48.000000000 +0200 +++ new/websocketpp-0.8.1/websocketpp/version.hpp 2018-07-16 14:40:53.000000000 +0200 @@ -44,7 +44,7 @@ /// Library minor version number static int const minor_version = 8; /// Library patch version number -static int const patch_version = 0; +static int const patch_version = 1; /// Library pre-release flag /** * This is a textual flag indicating the type and number for pre-release @@ -54,7 +54,7 @@ static char const prerelease_flag[] = ""; /// Default user agent string -static char const user_agent[] = "WebSocket++/0.8.0"; +static char const user_agent[] = "WebSocket++/0.8.1"; } // namespace websocketpp
