Compare commits
36 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
494d34987c | ||
|
|
6f10d7f42d | ||
|
|
08bae0e928 | ||
|
|
eef43b4393 | ||
|
|
0d7451f313 | ||
|
|
162b4de1fa | ||
|
|
e56e25ceb0 | ||
|
|
3240d75413 | ||
|
|
19be0bb636 | ||
|
|
908de352bf | ||
|
|
1d2e0cf31b | ||
|
|
d708c1d34f | ||
|
|
bb984cec36 | ||
|
|
0ca8b0a8b4 | ||
|
|
487a18e21f | ||
|
|
5422f128f4 | ||
|
|
c5df1fb152 | ||
|
|
e72a5da2ea | ||
|
|
c359bbe932 | ||
|
|
98fea54609 | ||
|
|
0d9d25ee51 | ||
|
|
df654078fc | ||
|
|
ae2f2aec6d | ||
|
|
493ba88624 | ||
|
|
11d8eea513 | ||
|
|
09322b4c2a | ||
|
|
3a8dd70fc7 | ||
|
|
ec12af4c1b | ||
|
|
634f53f593 | ||
|
|
5b5d20d00a | ||
|
|
1e1bda9802 | ||
|
|
bacc9021ff | ||
|
|
d4791a5d31 | ||
|
|
1dec616685 | ||
|
|
2b7863c36d | ||
|
|
736e3dd4b9 |
11 changed files with 2812 additions and 778 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1 +1,4 @@
|
||||||
/websocketpp-0.7.0.tar.gz
|
/websocketpp-0.7.0.tar.gz
|
||||||
|
/websocketpp-0.8.1.tar.gz
|
||||||
|
/websocketpp-0.8.2.tar.gz
|
||||||
|
/websocketpp-b9aeec6eaf3d5610503439b4fae3581d9aff08e8.tar.gz
|
||||||
|
|
|
||||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
5027c20cde76fdaef83a74acfcf98e23 websocketpp-0.7.0.tar.gz
|
SHA512 (websocketpp-b9aeec6eaf3d5610503439b4fae3581d9aff08e8.tar.gz) = 5449a10086c1b80d0d2865bac90539f64613156050816e97a2da1a2bc1f6710ac72305747e839a13e49b2ce1b25610480c110743aef60d7d148f2c39339289c4
|
||||||
|
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
diff -up websocketpp-0.7.0/CMakeLists.txt.cmake_noarch websocketpp-0.7.0/CMakeLists.txt
|
|
||||||
--- websocketpp-0.7.0/CMakeLists.txt.cmake_noarch 2016-02-22 07:30:10.000000000 -0600
|
|
||||||
+++ websocketpp-0.7.0/CMakeLists.txt 2016-09-15 13:05:59.012179625 -0500
|
|
||||||
@@ -19,7 +19,7 @@ set(INSTALL_INCLUDE_DIR include CACHE PA
|
|
||||||
if (WIN32 AND NOT CYGWIN)
|
|
||||||
set (DEF_INSTALL_CMAKE_DIR cmake)
|
|
||||||
else ()
|
|
||||||
- set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp)
|
|
||||||
+ set (DEF_INSTALL_CMAKE_DIR share/cmake/websocketpp)
|
|
||||||
endif ()
|
|
||||||
set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
|
|
||||||
|
|
||||||
|
|
@ -1,146 +0,0 @@
|
||||||
diff --git a/websocketpp/impl/connection_impl.hpp b/websocketpp/impl/connection_impl.hpp
|
|
||||||
index 93a5a16..bf88c95 100644
|
|
||||||
--- a/websocketpp/impl/connection_impl.hpp
|
|
||||||
+++ b/websocketpp/impl/connection_impl.hpp
|
|
||||||
@@ -1222,17 +1222,17 @@ lib::error_code connection<config>::process_handshake_request() {
|
|
||||||
std::pair<lib::error_code,std::string> neg_results;
|
|
||||||
neg_results = m_processor->negotiate_extensions(m_request);
|
|
||||||
|
|
||||||
- if (neg_results.first == error::make_error_code(error::extension_parse_error)) {
|
|
||||||
+ if (neg_results.first == processor::error::make_error_code(processor::error::extension_parse_error)) {
|
|
||||||
// There was a fatal error in extension parsing that should result in
|
|
||||||
// a failed connection attempt.
|
|
||||||
- m_alog.write(log::alevel::info, "Bad request: " + neg_results.first.message());
|
|
||||||
+ m_elog.write(log::elevel::info, "Bad request: " + neg_results.first.message());
|
|
||||||
m_response.set_status(http::status_code::bad_request);
|
|
||||||
return neg_results.first;
|
|
||||||
} else if (neg_results.first) {
|
|
||||||
// There was a fatal error in extension processing that is probably our
|
|
||||||
// fault. Consider extension negotiation to have failed and continue as
|
|
||||||
// if extensions were not supported
|
|
||||||
- m_alog.write(log::alevel::info,
|
|
||||||
+ m_elog.write(log::elevel::info,
|
|
||||||
"Extension negotiation failed: " + neg_results.first.message());
|
|
||||||
} else {
|
|
||||||
// extension negotiation succeeded, set response header accordingly
|
|
||||||
diff --git a/websocketpp/processors/hybi13.hpp b/websocketpp/processors/hybi13.hpp
|
|
||||||
index a95bc64..ca12439 100644
|
|
||||||
--- a/websocketpp/processors/hybi13.hpp
|
|
||||||
+++ b/websocketpp/processors/hybi13.hpp
|
|
||||||
@@ -97,11 +97,6 @@ public:
|
|
||||||
/**
|
|
||||||
* This exists mostly because the code for requests and responses is
|
|
||||||
* identical and I can't have virtual template methods.
|
|
||||||
- *
|
|
||||||
- * NOTE: this method makes assumptions that the permessage-deflate
|
|
||||||
- * extension is the only one supported. If additional extensions are
|
|
||||||
- * ever supported it should be reviewed carefully. Most cases where
|
|
||||||
- * that assumption is made are explicitly noted.
|
|
||||||
*/
|
|
||||||
template <typename header_type>
|
|
||||||
err_str_pair negotiate_extensions_helper(header_type const & header) {
|
|
||||||
@@ -130,55 +125,60 @@ public:
|
|
||||||
|
|
||||||
http::parameter_list::const_iterator it;
|
|
||||||
|
|
||||||
+ // look through the list of extension requests to find the first
|
|
||||||
+ // one that we can accept.
|
|
||||||
if (m_permessage_deflate.is_implemented()) {
|
|
||||||
err_str_pair neg_ret;
|
|
||||||
for (it = p.begin(); it != p.end(); ++it) {
|
|
||||||
- // look through each extension, if the key is permessage-deflate
|
|
||||||
- if (it->first == "permessage-deflate") {
|
|
||||||
- // if we have already successfully negotiated this extension
|
|
||||||
- // then skip any other requests to negotiate the same one
|
|
||||||
- // with different parameters
|
|
||||||
- if (m_permessage_deflate.is_enabled()) {
|
|
||||||
- continue;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
-
|
|
||||||
- neg_ret = m_permessage_deflate.negotiate(it->second);
|
|
||||||
-
|
|
||||||
- if (neg_ret.first) {
|
|
||||||
- // Figure out if this is an error that should halt all
|
|
||||||
- // extension negotiations or simply cause negotiation of
|
|
||||||
- // this specific extension to fail.
|
|
||||||
- //std::cout << "permessage-compress negotiation failed: "
|
|
||||||
- // << neg_ret.first.message() << std::endl;
|
|
||||||
- } else {
|
|
||||||
- // Note: this list will need commas if WebSocket++ ever
|
|
||||||
- // supports more than one extension
|
|
||||||
-
|
|
||||||
- // Actually try to initialize the extension before we
|
|
||||||
- // deem negotiation complete
|
|
||||||
- ret.first = m_permessage_deflate.init(base::m_server);
|
|
||||||
- if (!ret.first) {
|
|
||||||
-
|
|
||||||
- // TODO: support multiple extensions.
|
|
||||||
- // right now, because there is only one extension
|
|
||||||
- // supported, it failing to negotiate means we are
|
|
||||||
- // done with all negotiating. In the future if more
|
|
||||||
- // extensions are supported a better solution will
|
|
||||||
- // be needed here.
|
|
||||||
- break;
|
|
||||||
- } else {
|
|
||||||
- ret.second += neg_ret.second;
|
|
||||||
+ // not a permessage-deflate extension request, ignore
|
|
||||||
+ if (it->first != "permessage-deflate") {
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- // continue looking for more extensions
|
|
||||||
- continue;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- }
|
|
||||||
+ // if we have already successfully negotiated this extension
|
|
||||||
+ // then skip any other requests to negotiate the same one
|
|
||||||
+ // with different parameters
|
|
||||||
+ if (m_permessage_deflate.is_enabled()) {
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // attempt to negotiate this offer
|
|
||||||
+ neg_ret = m_permessage_deflate.negotiate(it->second);
|
|
||||||
+
|
|
||||||
+ if (neg_ret.first) {
|
|
||||||
+ // negotiation offer failed. Do nothing. We will continue
|
|
||||||
+ // searching for a permessage-deflate config that succeeds
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Negotiation tentatively succeeded
|
|
||||||
+
|
|
||||||
+ // Actually try to initialize the extension before we
|
|
||||||
+ // deem negotiation complete
|
|
||||||
+ lib::error_code ec = m_permessage_deflate.init(base::m_server);
|
|
||||||
+
|
|
||||||
+ if (ec) {
|
|
||||||
+ // Negotiation succeeded but initialization failed this is
|
|
||||||
+ // an error that should stop negotiation of permessage
|
|
||||||
+ // deflate. Return the reason for the init failure
|
|
||||||
+
|
|
||||||
+ ret.first = ec;
|
|
||||||
+ break;
|
|
||||||
+ } else {
|
|
||||||
+ // Successfully initialized, push the negotiated response into
|
|
||||||
+ // the reply and stop looking for additional permessage-deflate
|
|
||||||
+ // extensions
|
|
||||||
+ ret.second += neg_ret.second;
|
|
||||||
+ break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ // support for future extensions would go here. Should check the value of
|
|
||||||
+ // ret.first before continuing. Might need to consider whether failure of
|
|
||||||
+ // negotiation of an earlier extension should stop negotiation of subsequent
|
|
||||||
+ // ones
|
|
||||||
+
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.13.0
|
|
||||||
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
diff -up websocketpp-0.7.0/websocketpp/transport/asio/security/tls.hpp.openssl11 websocketpp-0.7.0/websocketpp/transport/asio/security/tls.hpp
|
|
||||||
--- websocketpp-0.7.0/websocketpp/transport/asio/security/tls.hpp.openssl11 2016-02-22 07:30:10.000000000 -0600
|
|
||||||
+++ websocketpp-0.7.0/websocketpp/transport/asio/security/tls.hpp 2017-05-22 09:49:43.613622484 -0500
|
|
||||||
@@ -355,13 +355,17 @@ protected:
|
|
||||||
template <typename ErrorCodeType>
|
|
||||||
lib::error_code translate_ec(ErrorCodeType ec) {
|
|
||||||
if (ec.category() == lib::asio::error::get_ssl_category()) {
|
|
||||||
+#ifdef SSL_R_SHORT_READ
|
|
||||||
if (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ) {
|
|
||||||
return make_error_code(transport::error::tls_short_read);
|
|
||||||
} else {
|
|
||||||
+#endif
|
|
||||||
// We know it is a TLS related error, but otherwise don't know
|
|
||||||
// more. Pass through as TLS generic.
|
|
||||||
return make_error_code(transport::error::tls_error);
|
|
||||||
+#ifdef SSL_R_SHORT_READ
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
} else {
|
|
||||||
// We don't know any more information about this error so pass
|
|
||||||
// through
|
|
||||||
|
|
@ -1,566 +0,0 @@
|
||||||
diff --git a/test/extension/permessage_deflate.cpp b/test/extension/permessage_deflate.cpp
|
|
||||||
index 4cd3e7b..805afcc 100644
|
|
||||||
--- a/test/extension/permessage_deflate.cpp
|
|
||||||
+++ b/test/extension/permessage_deflate.cpp
|
|
||||||
@@ -186,15 +186,22 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_invalid ) {
|
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_valid ) {
|
|
||||||
ext_vars v;
|
|
||||||
+
|
|
||||||
+ // confirm that a request for a value of 8 is interpreted as 9
|
|
||||||
v.attr["server_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; server_max_window_bits=9");
|
|
||||||
|
|
||||||
+ v.attr["server_max_window_bits"] = "9";
|
|
||||||
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; server_max_window_bits=8");
|
|
||||||
+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9");
|
|
||||||
|
|
||||||
- v.attr["server_max_window_bits"] = "15";
|
|
||||||
|
|
||||||
+ v.attr["server_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() );
|
|
||||||
@@ -213,7 +220,7 @@ BOOST_AUTO_TEST_CASE( invalid_set_server_max_window_bits ) {
|
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_decline ) {
|
|
||||||
ext_vars v;
|
|
||||||
- v.attr["server_max_window_bits"] = "8";
|
|
||||||
+ v.attr["server_max_window_bits"] = "9";
|
|
||||||
|
|
||||||
v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::decline);
|
|
||||||
v.esp = v.exts.negotiate(v.attr);
|
|
||||||
@@ -223,7 +230,7 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_decline ) {
|
|
||||||
BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
|
|
||||||
}
|
|
||||||
|
|
||||||
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) {
|
|
||||||
+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept_8 ) {
|
|
||||||
ext_vars v;
|
|
||||||
v.attr["server_max_window_bits"] = "8";
|
|
||||||
|
|
||||||
@@ -232,10 +239,22 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) {
|
|
||||||
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; server_max_window_bits=8");
|
|
||||||
+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9");
|
|
||||||
}
|
|
||||||
|
|
||||||
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) {
|
|
||||||
+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) {
|
|
||||||
+ ext_vars v;
|
|
||||||
+ v.attr["server_max_window_bits"] = "9";
|
|
||||||
+
|
|
||||||
+ v.ec = v.exts.set_server_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; server_max_window_bits=9");
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest_8 ) {
|
|
||||||
ext_vars v;
|
|
||||||
v.attr["server_max_window_bits"] = "8";
|
|
||||||
|
|
||||||
@@ -244,10 +263,22 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) {
|
|
||||||
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; server_max_window_bits=8");
|
|
||||||
+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9");
|
|
||||||
}
|
|
||||||
|
|
||||||
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) {
|
|
||||||
+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) {
|
|
||||||
+ ext_vars v;
|
|
||||||
+ v.attr["server_max_window_bits"] = "9";
|
|
||||||
+
|
|
||||||
+ v.ec = v.exts.set_server_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; server_max_window_bits=9");
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest_8 ) {
|
|
||||||
ext_vars v;
|
|
||||||
v.attr["server_max_window_bits"] = "8";
|
|
||||||
|
|
||||||
@@ -256,7 +287,19 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) {
|
|
||||||
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; server_max_window_bits=8");
|
|
||||||
+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9");
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) {
|
|
||||||
+ ext_vars v;
|
|
||||||
+ v.attr["server_max_window_bits"] = "9";
|
|
||||||
+
|
|
||||||
+ v.ec = v.exts.set_server_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; server_max_window_bits=9");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Negotiate server_max_window_bits
|
|
||||||
@@ -292,7 +335,13 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_valid ) {
|
|
||||||
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; client_max_window_bits=8");
|
|
||||||
+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9");
|
|
||||||
+
|
|
||||||
+ v.attr["client_max_window_bits"] = "9";
|
|
||||||
+ 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; client_max_window_bits=9");
|
|
||||||
|
|
||||||
v.attr["client_max_window_bits"] = "15";
|
|
||||||
v.esp = v.exts.negotiate(v.attr);
|
|
||||||
@@ -311,7 +360,7 @@ BOOST_AUTO_TEST_CASE( invalid_set_client_max_window_bits ) {
|
|
||||||
BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
|
|
||||||
}
|
|
||||||
|
|
||||||
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) {
|
|
||||||
+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline_8 ) {
|
|
||||||
ext_vars v;
|
|
||||||
v.attr["client_max_window_bits"] = "8";
|
|
||||||
|
|
||||||
@@ -323,7 +372,19 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) {
|
|
||||||
BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
|
|
||||||
}
|
|
||||||
|
|
||||||
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) {
|
|
||||||
+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) {
|
|
||||||
+ ext_vars v;
|
|
||||||
+ v.attr["client_max_window_bits"] = "9";
|
|
||||||
+
|
|
||||||
+ v.ec = v.exts.set_client_max_window_bits(9,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_client_max_window_bits_accept_8 ) {
|
|
||||||
ext_vars v;
|
|
||||||
v.attr["client_max_window_bits"] = "8";
|
|
||||||
|
|
||||||
@@ -332,10 +393,22 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) {
|
|
||||||
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; client_max_window_bits=8");
|
|
||||||
+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9");
|
|
||||||
}
|
|
||||||
|
|
||||||
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) {
|
|
||||||
+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) {
|
|
||||||
+ ext_vars v;
|
|
||||||
+ v.attr["client_max_window_bits"] = "9";
|
|
||||||
+
|
|
||||||
+ v.ec = v.exts.set_client_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; client_max_window_bits=9");
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest_8 ) {
|
|
||||||
ext_vars v;
|
|
||||||
v.attr["client_max_window_bits"] = "8";
|
|
||||||
|
|
||||||
@@ -344,10 +417,22 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) {
|
|
||||||
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; client_max_window_bits=8");
|
|
||||||
+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9");
|
|
||||||
}
|
|
||||||
|
|
||||||
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) {
|
|
||||||
+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) {
|
|
||||||
+ ext_vars v;
|
|
||||||
+ v.attr["client_max_window_bits"] = "9";
|
|
||||||
+
|
|
||||||
+ v.ec = v.exts.set_client_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; client_max_window_bits=9");
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest_8 ) {
|
|
||||||
ext_vars v;
|
|
||||||
v.attr["client_max_window_bits"] = "8";
|
|
||||||
|
|
||||||
@@ -356,7 +441,19 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) {
|
|
||||||
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; client_max_window_bits=8");
|
|
||||||
+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9");
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) {
|
|
||||||
+ ext_vars v;
|
|
||||||
+ v.attr["client_max_window_bits"] = "9";
|
|
||||||
+
|
|
||||||
+ v.ec = v.exts.set_client_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; client_max_window_bits=9");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -507,7 +604,8 @@ BOOST_AUTO_TEST_CASE( compress_data ) {
|
|
||||||
std::string compress_out;
|
|
||||||
std::string decompress_out;
|
|
||||||
|
|
||||||
- v.exts.init(true);
|
|
||||||
+ v.ec = v.exts.init(true);
|
|
||||||
+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
|
|
||||||
|
|
||||||
v.ec = v.exts.compress(compress_in,compress_out);
|
|
||||||
BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
|
|
||||||
@@ -520,7 +618,8 @@ BOOST_AUTO_TEST_CASE( compress_data ) {
|
|
||||||
BOOST_AUTO_TEST_CASE( compress_data_multiple ) {
|
|
||||||
ext_vars v;
|
|
||||||
|
|
||||||
- v.exts.init(true);
|
|
||||||
+ v.ec = v.exts.init(true);
|
|
||||||
+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
|
|
||||||
|
|
||||||
for (int i = 0; i < 2; i++) {
|
|
||||||
std::string compress_in = "Hello";
|
|
||||||
@@ -545,11 +644,12 @@ BOOST_AUTO_TEST_CASE( compress_data_large ) {
|
|
||||||
|
|
||||||
websocketpp::http::attribute_list alist;
|
|
||||||
|
|
||||||
- alist["server_max_window_bits"] = "8";
|
|
||||||
- v.exts.set_server_max_window_bits(8,websocketpp::extensions::permessage_deflate::mode::smallest);
|
|
||||||
+ alist["server_max_window_bits"] = "9";
|
|
||||||
+ v.exts.set_server_max_window_bits(9,websocketpp::extensions::permessage_deflate::mode::smallest);
|
|
||||||
|
|
||||||
v.exts.negotiate(alist);
|
|
||||||
- v.exts.init(true);
|
|
||||||
+ v.ec = v.exts.init(true);
|
|
||||||
+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
|
|
||||||
|
|
||||||
v.ec = v.exts.compress(compress_in,compress_out);
|
|
||||||
BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
|
|
||||||
@@ -573,7 +673,8 @@ BOOST_AUTO_TEST_CASE( compress_data_no_context_takeover ) {
|
|
||||||
v.exts.enable_server_no_context_takeover();
|
|
||||||
|
|
||||||
v.exts.negotiate(alist);
|
|
||||||
- v.exts.init(true);
|
|
||||||
+ v.ec = v.exts.init(true);
|
|
||||||
+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
|
|
||||||
|
|
||||||
v.ec = v.exts.compress(compress_in,compress_out1);
|
|
||||||
BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
|
|
||||||
@@ -609,7 +710,8 @@ BOOST_AUTO_TEST_CASE( compress_empty ) {
|
|
||||||
std::string compress_out;
|
|
||||||
std::string decompress_out;
|
|
||||||
|
|
||||||
- v.exts.init(true);
|
|
||||||
+ v.ec = v.exts.init(true);
|
|
||||||
+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
|
|
||||||
|
|
||||||
v.ec = v.exts.compress(compress_in,compress_out);
|
|
||||||
BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
|
|
||||||
@@ -640,7 +742,8 @@ BOOST_AUTO_TEST_CASE( decompress_data ) {
|
|
||||||
std::string out;
|
|
||||||
std::string reference = "Hello";
|
|
||||||
|
|
||||||
- v.exts.init(true);
|
|
||||||
+ v.ec = v.exts.init(true);
|
|
||||||
+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
|
|
||||||
|
|
||||||
v.ec = v.exts.decompress(in,11,out);
|
|
||||||
|
|
||||||
diff --git a/websocketpp/extensions/permessage_deflate/enabled.hpp b/websocketpp/extensions/permessage_deflate/enabled.hpp
|
|
||||||
index 1581f14..f20a1b1 100644
|
|
||||||
--- a/websocketpp/extensions/permessage_deflate/enabled.hpp
|
|
||||||
+++ b/websocketpp/extensions/permessage_deflate/enabled.hpp
|
|
||||||
@@ -46,7 +46,7 @@
|
|
||||||
namespace websocketpp {
|
|
||||||
namespace extensions {
|
|
||||||
|
|
||||||
-/// Implementation of the draft permessage-deflate WebSocket extension
|
|
||||||
+/// Implementation of RFC 7692, the permessage-deflate WebSocket extension
|
|
||||||
/**
|
|
||||||
* ### permessage-deflate interface
|
|
||||||
*
|
|
||||||
@@ -174,18 +174,30 @@ namespace websocketpp {
|
|
||||||
namespace extensions {
|
|
||||||
namespace permessage_deflate {
|
|
||||||
|
|
||||||
-/// Default value for server_max_window_bits as defined by draft 17
|
|
||||||
+/// Default value for server_max_window_bits as defined by RFC 7692
|
|
||||||
static uint8_t const default_server_max_window_bits = 15;
|
|
||||||
-/// Minimum value for server_max_window_bits as defined by draft 17
|
|
||||||
+/// Minimum value for server_max_window_bits as defined by RFC 7692
|
|
||||||
+/**
|
|
||||||
+ * NOTE: A value of 8 is not actually supported by zlib, the deflate
|
|
||||||
+ * library that WebSocket++ uses. To preserve backwards compatibility
|
|
||||||
+ * with RFC 7692 and previous versions of the library a value of 8
|
|
||||||
+ * is accepted by the library but will always be negotiated as 9.
|
|
||||||
+ */
|
|
||||||
static uint8_t const min_server_max_window_bits = 8;
|
|
||||||
-/// Maximum value for server_max_window_bits as defined by draft 17
|
|
||||||
+/// Maximum value for server_max_window_bits as defined by RFC 7692
|
|
||||||
static uint8_t const max_server_max_window_bits = 15;
|
|
||||||
|
|
||||||
-/// Default value for client_max_window_bits as defined by draft 17
|
|
||||||
+/// Default value for client_max_window_bits as defined by RFC 7692
|
|
||||||
static uint8_t const default_client_max_window_bits = 15;
|
|
||||||
-/// Minimum value for client_max_window_bits as defined by draft 17
|
|
||||||
+/// Minimum value for client_max_window_bits as defined by RFC 7692
|
|
||||||
+/**
|
|
||||||
+ * NOTE: A value of 8 is not actually supported by zlib, the deflate
|
|
||||||
+ * library that WebSocket++ uses. To preserve backwards compatibility
|
|
||||||
+ * with RFC 7692 and previous versions of the library a value of 8
|
|
||||||
+ * is accepted by the library but will always be negotiated as 9.
|
|
||||||
+ */
|
|
||||||
static uint8_t const min_client_max_window_bits = 8;
|
|
||||||
-/// Maximum value for client_max_window_bits as defined by draft 17
|
|
||||||
+/// Maximum value for client_max_window_bits as defined by RFC 7692
|
|
||||||
static uint8_t const max_client_max_window_bits = 15;
|
|
||||||
|
|
||||||
namespace mode {
|
|
||||||
@@ -372,7 +384,7 @@ public:
|
|
||||||
/**
|
|
||||||
* The bits setting is the base 2 logarithm of the maximum window size that
|
|
||||||
* the server must use to compress outgoing messages. The permitted range
|
|
||||||
- * is 8 to 15 inclusive. 8 represents a 256 byte window and 15 a 32KiB
|
|
||||||
+ * is 9 to 15 inclusive. 9 represents a 512 byte window and 15 a 32KiB
|
|
||||||
* window. The default setting is 15.
|
|
||||||
*
|
|
||||||
* Mode Options:
|
|
||||||
@@ -386,6 +398,14 @@ public:
|
|
||||||
* adjusted by the server. A server may unilaterally set this value without
|
|
||||||
* client support.
|
|
||||||
*
|
|
||||||
+ * NOTE: The permessage-deflate spec specifies that a value of 8 is allowed.
|
|
||||||
+ * Prior to version 0.8.0 a value of 8 was also allowed by this library.
|
|
||||||
+ * zlib, the deflate compression library that WebSocket++ uses has always
|
|
||||||
+ * silently adjusted a value of 8 to 9. In recent versions of zlib (1.2.9
|
|
||||||
+ * and greater) a value of 8 is now explicitly rejected. WebSocket++ 0.8.0
|
|
||||||
+ * continues to perform the 8->9 conversion for backwards compatibility
|
|
||||||
+ * purposes but this should be considered deprecated functionality.
|
|
||||||
+ *
|
|
||||||
* @param bits The size to request for the outgoing window size
|
|
||||||
* @param mode The mode to use for negotiating this parameter
|
|
||||||
* @return A status code
|
|
||||||
@@ -394,6 +414,12 @@ public:
|
|
||||||
if (bits < min_server_max_window_bits || bits > max_server_max_window_bits) {
|
|
||||||
return error::make_error_code(error::invalid_max_window_bits);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ // See note in doc comment above about what is happening here
|
|
||||||
+ if (bits == 8) {
|
|
||||||
+ bits = 9;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
m_server_max_window_bits = bits;
|
|
||||||
m_server_max_window_bits_mode = mode;
|
|
||||||
|
|
||||||
@@ -403,8 +429,8 @@ public:
|
|
||||||
/// Limit client LZ77 sliding window size
|
|
||||||
/**
|
|
||||||
* The bits setting is the base 2 logarithm of the window size that the
|
|
||||||
- * client must use to compress outgoing messages. The permitted range is 8
|
|
||||||
- * to 15 inclusive. 8 represents a 256 byte window and 15 a 32KiB window.
|
|
||||||
+ * client must use to compress outgoing messages. The permitted range is 9
|
|
||||||
+ * to 15 inclusive. 9 represents a 512 byte window and 15 a 32KiB window.
|
|
||||||
* The default setting is 15.
|
|
||||||
*
|
|
||||||
* Mode Options:
|
|
||||||
@@ -417,6 +443,14 @@ public:
|
|
||||||
* outgoing window size unilaterally. A server may only limit the client's
|
|
||||||
* window size if the remote client supports that feature.
|
|
||||||
*
|
|
||||||
+ * NOTE: The permessage-deflate spec specifies that a value of 8 is allowed.
|
|
||||||
+ * Prior to version 0.8.0 a value of 8 was also allowed by this library.
|
|
||||||
+ * zlib, the deflate compression library that WebSocket++ uses has always
|
|
||||||
+ * silently adjusted a value of 8 to 9. In recent versions of zlib (1.2.9
|
|
||||||
+ * and greater) a value of 8 is now explicitly rejected. WebSocket++ 0.8.0
|
|
||||||
+ * continues to perform the 8->9 conversion for backwards compatibility
|
|
||||||
+ * purposes but this should be considered deprecated functionality.
|
|
||||||
+ *
|
|
||||||
* @param bits The size to request for the outgoing window size
|
|
||||||
* @param mode The mode to use for negotiating this parameter
|
|
||||||
* @return A status code
|
|
||||||
@@ -425,6 +459,12 @@ public:
|
|
||||||
if (bits < min_client_max_window_bits || bits > max_client_max_window_bits) {
|
|
||||||
return error::make_error_code(error::invalid_max_window_bits);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ // See note in doc comment above about what is happening here
|
|
||||||
+ if (bits == 8) {
|
|
||||||
+ bits = 9;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
m_client_max_window_bits = bits;
|
|
||||||
m_client_max_window_bits_mode = mode;
|
|
||||||
|
|
||||||
@@ -642,11 +682,17 @@ private:
|
|
||||||
* client requested that we use.
|
|
||||||
*
|
|
||||||
* options:
|
|
||||||
- * - decline (refuse to use the attribute)
|
|
||||||
- * - accept (use whatever the client says)
|
|
||||||
- * - largest (use largest possible value)
|
|
||||||
+ * - decline (ignore value, offer our default instead)
|
|
||||||
+ * - accept (use the value requested by the client)
|
|
||||||
+ * - largest (use largest value acceptable to both)
|
|
||||||
* - smallest (use smallest possible value)
|
|
||||||
*
|
|
||||||
+ * NOTE: As a value of 8 is no longer explicitly supported by zlib but might
|
|
||||||
+ * be requested for negotiation by an older client/server, if the result of
|
|
||||||
+ * the negotiation would be to send a value of 8, a value of 9 is offered
|
|
||||||
+ * instead. This ensures that WebSocket++ will only ever negotiate connections
|
|
||||||
+ * with compression settings explicitly supported by zlib.
|
|
||||||
+ *
|
|
||||||
* @param [in] value The value of the attribute from the offer
|
|
||||||
* @param [out] ec A reference to the error code to return errors via
|
|
||||||
*/
|
|
||||||
@@ -678,6 +724,11 @@ private:
|
|
||||||
ec = make_error_code(error::invalid_mode);
|
|
||||||
m_server_max_window_bits = default_server_max_window_bits;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ // See note in doc comment
|
|
||||||
+ if (m_server_max_window_bits == 8) {
|
|
||||||
+ m_server_max_window_bits = 9;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Negotiate client_max_window_bits attribute
|
|
||||||
@@ -687,11 +738,17 @@ private:
|
|
||||||
* negotiation mode.
|
|
||||||
*
|
|
||||||
* options:
|
|
||||||
- * - decline (refuse to use the attribute)
|
|
||||||
- * - accept (use whatever the client says)
|
|
||||||
- * - largest (use largest possible value)
|
|
||||||
+ * - decline (ignore value, offer our default instead)
|
|
||||||
+ * - accept (use the value requested by the client)
|
|
||||||
+ * - largest (use largest value acceptable to both)
|
|
||||||
* - smallest (use smallest possible value)
|
|
||||||
*
|
|
||||||
+ * NOTE: As a value of 8 is no longer explicitly supported by zlib but might
|
|
||||||
+ * be requested for negotiation by an older client/server, if the result of
|
|
||||||
+ * the negotiation would be to send a value of 8, a value of 9 is offered
|
|
||||||
+ * instead. This ensures that WebSocket++ will only ever negotiate connections
|
|
||||||
+ * with compression settings explicitly supported by zlib.
|
|
||||||
+ *
|
|
||||||
* @param [in] value The value of the attribute from the offer
|
|
||||||
* @param [out] ec A reference to the error code to return errors via
|
|
||||||
*/
|
|
||||||
@@ -727,6 +784,11 @@ private:
|
|
||||||
ec = make_error_code(error::invalid_mode);
|
|
||||||
m_client_max_window_bits = default_client_max_window_bits;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ // See note in doc comment
|
|
||||||
+ if (m_client_max_window_bits == 8) {
|
|
||||||
+ m_client_max_window_bits = 9;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
bool m_enabled;
|
|
||||||
diff --git a/websocketpp/impl/connection_impl.hpp b/websocketpp/impl/connection_impl.hpp
|
|
||||||
index 105911d..ae55c33 100644
|
|
||||||
--- a/websocketpp/impl/connection_impl.hpp
|
|
||||||
+++ b/websocketpp/impl/connection_impl.hpp
|
|
||||||
@@ -1222,12 +1222,18 @@ lib::error_code connection<config>::process_handshake_request() {
|
|
||||||
std::pair<lib::error_code,std::string> neg_results;
|
|
||||||
neg_results = m_processor->negotiate_extensions(m_request);
|
|
||||||
|
|
||||||
- if (neg_results.first) {
|
|
||||||
+ if (neg_results.first == error::make_error_code(error::extension_parse_error)) {
|
|
||||||
// There was a fatal error in extension parsing that should result in
|
|
||||||
// a failed connection attempt.
|
|
||||||
- m_alog.write(log::alevel::devel, "Bad request: " + neg_results.first.message());
|
|
||||||
+ m_alog.write(log::alevel::info, "Bad request: " + neg_results.first.message());
|
|
||||||
m_response.set_status(http::status_code::bad_request);
|
|
||||||
return neg_results.first;
|
|
||||||
+ } else if (neg_results.first) {
|
|
||||||
+ // There was a fatal error in extension processing that is probably our
|
|
||||||
+ // fault. Consider extension negotiation to have failed and continue as
|
|
||||||
+ // if extensions were not supported
|
|
||||||
+ m_alog.write(log::alevel::info,
|
|
||||||
+ "Extension negotiation failed: " + neg_results.first.message());
|
|
||||||
} else {
|
|
||||||
// extension negotiation succeeded, set response header accordingly
|
|
||||||
// we don't send an empty extensions header because it breaks many
|
|
||||||
diff --git a/websocketpp/processors/hybi13.hpp b/websocketpp/processors/hybi13.hpp
|
|
||||||
index 7948665..a95bc64 100644
|
|
||||||
--- a/websocketpp/processors/hybi13.hpp
|
|
||||||
+++ b/websocketpp/processors/hybi13.hpp
|
|
||||||
@@ -97,6 +97,11 @@ public:
|
|
||||||
/**
|
|
||||||
* This exists mostly because the code for requests and responses is
|
|
||||||
* identical and I can't have virtual template methods.
|
|
||||||
+ *
|
|
||||||
+ * NOTE: this method makes assumptions that the permessage-deflate
|
|
||||||
+ * extension is the only one supported. If additional extensions are
|
|
||||||
+ * ever supported it should be reviewed carefully. Most cases where
|
|
||||||
+ * that assumption is made are explicitly noted.
|
|
||||||
*/
|
|
||||||
template <typename header_type>
|
|
||||||
err_str_pair negotiate_extensions_helper(header_type const & header) {
|
|
||||||
@@ -149,9 +154,26 @@ public:
|
|
||||||
} else {
|
|
||||||
// Note: this list will need commas if WebSocket++ ever
|
|
||||||
// supports more than one extension
|
|
||||||
- ret.second += neg_ret.second;
|
|
||||||
- m_permessage_deflate.init(base::m_server);
|
|
||||||
- continue;
|
|
||||||
+
|
|
||||||
+ // Actually try to initialize the extension before we
|
|
||||||
+ // deem negotiation complete
|
|
||||||
+ ret.first = m_permessage_deflate.init(base::m_server);
|
|
||||||
+ if (!ret.first) {
|
|
||||||
+
|
|
||||||
+ // TODO: support multiple extensions.
|
|
||||||
+ // right now, because there is only one extension
|
|
||||||
+ // supported, it failing to negotiate means we are
|
|
||||||
+ // done with all negotiating. In the future if more
|
|
||||||
+ // extensions are supported a better solution will
|
|
||||||
+ // be needed here.
|
|
||||||
+ break;
|
|
||||||
+ } else {
|
|
||||||
+ ret.second += neg_ret.second;
|
|
||||||
+
|
|
||||||
+ // continue looking for more extensions
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.13.0
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
--- a/CMakeLists.txt 2018-10-31 13:58:03.000000000 +0100
|
||||||
|
+++ b/CMakeLists.txt 2018-10-31 14:21:06.251424022 +0100
|
||||||
|
@@ -266,9 +266,11 @@
|
||||||
|
INSTALL_DESTINATION "${INSTALL_CMAKE_DIR}"
|
||||||
|
NO_CHECK_REQUIRED_COMPONENTS_MACRO
|
||||||
|
)
|
||||||
|
+# disable check for same 32/64bit-ness in websocketpp-configVersion.cmake by setting CMAKE_SIZEOF_VOID_P
|
||||||
|
+set (CMAKE_SIZEOF_VOID_P "")
|
||||||
|
write_basic_package_version_file("${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake"
|
||||||
|
VERSION ${WEBSOCKETPP_VERSION}
|
||||||
|
- COMPATIBILITY ExactVersion)
|
||||||
|
+ COMPATIBILITY AnyNewerVersion)
|
||||||
|
|
||||||
|
# Install the websocketpp-config.cmake and websocketpp-configVersion.cmake
|
||||||
|
install (FILES
|
||||||
2610
websocketpp-0.8.2-compatibility_fixes_for_boost_1.87.patch
Normal file
2610
websocketpp-0.8.2-compatibility_fixes_for_boost_1.87.patch
Normal file
File diff suppressed because it is too large
Load diff
11
websocketpp-0.8.3-cmake_noarch.patch
Normal file
11
websocketpp-0.8.3-cmake_noarch.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/CMakeLists.txt 2022-05-24 17:42:50.000000000 +0200
|
||||||
|
+++ b/CMakeLists.txt 2026-01-27 20:15:14.456352600 +0100
|
||||||
|
@@ -45,7 +45,7 @@ set(INSTALL_INCLUDE_DIR include CACHE PA
|
||||||
|
if (WIN32 AND NOT CYGWIN)
|
||||||
|
set (DEF_INSTALL_CMAKE_DIR cmake)
|
||||||
|
else ()
|
||||||
|
- set (DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/websocketpp)
|
||||||
|
+ set (DEF_INSTALL_CMAKE_DIR share/cmake/websocketpp)
|
||||||
|
endif ()
|
||||||
|
set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
|
||||||
|
|
||||||
|
|
@ -4,6 +4,6 @@ includedir=${prefix}/include
|
||||||
|
|
||||||
Name: websocketpp
|
Name: websocketpp
|
||||||
Description: WebSocket API
|
Description: WebSocket API
|
||||||
Version: 0.7.0
|
Version: 0.8.2
|
||||||
URL: http://www.zaphoyd.com/websocketpp/
|
URL: https://www.zaphoyd.com/websocketpp/
|
||||||
Cflags: -I${includedir}/
|
Cflags: -I${includedir}/
|
||||||
|
|
|
||||||
198
websocketpp.spec
198
websocketpp.spec
|
|
@ -1,42 +1,53 @@
|
||||||
|
%global basever 0.8.2
|
||||||
|
%global commit b9aeec6eaf3d5610503439b4fae3581d9aff08e8
|
||||||
|
%global shortcommit %{sub %{commit} 1 7}
|
||||||
|
%global snapdate 20220525
|
||||||
|
|
||||||
Name: websocketpp
|
Name: websocketpp
|
||||||
Summary: C++ WebSocket Protocol Library
|
Summary: C++ WebSocket Protocol Library
|
||||||
Version: 0.7.0
|
Version: %{basever}%{?snapdate:^git%{snapdate}.%{shortcommit}}
|
||||||
Release: 10%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
License: BSD
|
# Automatically converted from old format: BSD - review is highly recommended.
|
||||||
Url: http://www.zaphoyd.com/websocketpp
|
License: LicenseRef-Callaway-BSD
|
||||||
|
Url: https://www.zaphoyd.com/websocketpp
|
||||||
|
%if %{defined snapdate}
|
||||||
|
Source0: https://github.com/zaphoyd/websocketpp/archive/%{commit}/%{name}-%{commit}.tar.gz
|
||||||
|
%else
|
||||||
Source0: https://github.com/zaphoyd/websocketpp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source0: https://github.com/zaphoyd/websocketpp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
|
%endif
|
||||||
Source1: websocketpp.pc
|
Source1: websocketpp.pc
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
# put cmake files in share/cmake instead of lib/cmake
|
# put cmake files in share/cmake instead of lib/cmake
|
||||||
Patch1: websocketpp-0.7.0-cmake_noarch.patch
|
Patch1: websocketpp-0.8.3-cmake_noarch.patch
|
||||||
|
|
||||||
# make compatible with openssl-1.1.x
|
# Switch from ExactVersion to AnyNewerVersion to improve compatibility
|
||||||
# https://github.com/zaphoyd/websocketpp/issues/599
|
# https://cmake.org/cmake/help/v3.0/module/CMakePackageConfigHelpers.html
|
||||||
Patch2: websocketpp-0.7.0-openssl11.patch
|
# Fixes build failure of tomahawk, which uses "find_package(websocketpp 0.2.99 REQUIRED)"
|
||||||
|
# PR submitted upstream: https://github.com/zaphoyd/websocketpp/pull/740
|
||||||
# Fix build and test failures with zlib 1.2.11. Fixes test_permessage_deflate
|
# Disable check for same 32/64bit-ness in websocketpp-configVersion.cmake by setting CMAKE_SIZEOF_VOID_P
|
||||||
# https://github.com/zaphoyd/websocketpp/issues/653
|
# PR submitted upstream: https://github.com/zaphoyd/websocketpp/pull/770
|
||||||
# Upstream patches, backported to websocketpp-0.7.0
|
Patch2: websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patch
|
||||||
# https://github.com/zaphoyd/websocketpp/commit/9ddb300d874a30db35e3ad58f188944bef0bf31b
|
|
||||||
Patch3: websocketpp-0.7.0-zlib-permessage-deflate.patch
|
|
||||||
# https://github.com/zaphoyd/websocketpp/commit/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4
|
|
||||||
Patch4: websocketpp-0.7.0-minor-adjustments-to-recent-extension-negotiation.patch
|
|
||||||
|
|
||||||
# Disable the following tests, which fail occasionally: test_transport, test_transport_asio_timers
|
# Disable the following tests, which fail occasionally: test_transport, test_transport_asio_timers
|
||||||
Patch5: websocketpp-0.7.0-disable-test_transport-test_transport_asio_timers.patch
|
Patch3: websocketpp-0.7.0-disable-test_transport-test_transport_asio_timers.patch
|
||||||
|
|
||||||
|
# Compatibility fixes for Boost 1.87
|
||||||
|
# https://github.com/zaphoyd/websocketpp/pull/1164
|
||||||
|
# Patch from PR at commit ee8cf42, 2025-04-09
|
||||||
|
Patch4: websocketpp-0.8.2-compatibility_fixes_for_boost_1.87.patch
|
||||||
|
|
||||||
BuildRequires: boost-devel
|
BuildRequires: boost-devel
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
|
BuildRequires: gcc-c++
|
||||||
# needed for tests mostly
|
# needed for tests mostly
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: pkgconfig(openssl)
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
|
|
||||||
%description
|
%description
|
||||||
WebSocket++ is an open source (BSD license) header only C++ library
|
WebSocket++ is an open source (BSD license) header only C++ library
|
||||||
that impliments RFC6455 The WebSocket Protocol. It allows integrating
|
that implements RFC6455 The WebSocket Protocol. It allows integrating
|
||||||
WebSocket client and server functionality into C++ programs. It uses
|
WebSocket client and server functionality into C++ programs. It uses
|
||||||
interchangeable network transport modules including one based on C++
|
interchangeable network transport modules including one based on C++
|
||||||
iostreams and one based on Boost Asio.
|
iostreams and one based on Boost Asio.
|
||||||
|
|
@ -46,35 +57,36 @@ Summary: C++ WebSocket Protocol Library
|
||||||
Requires: boost-devel
|
Requires: boost-devel
|
||||||
%description devel
|
%description devel
|
||||||
WebSocket++ is an open source (BSD license) header only C++ library
|
WebSocket++ is an open source (BSD license) header only C++ library
|
||||||
that impliments RFC6455 The WebSocket Protocol. It allows integrating
|
that implements RFC6455 The WebSocket Protocol. It allows integrating
|
||||||
WebSocket client and server functionality into C++ programs. It uses
|
WebSocket client and server functionality into C++ programs. It uses
|
||||||
interchangeable network transport modules including one based on C++
|
interchangeable network transport modules including one based on C++
|
||||||
iostreams and one based on Boost Asio.
|
iostreams and one based on Boost Asio.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
|
%if %{defined snapdate}
|
||||||
|
%autosetup -p1 -n %{name}-%{commit}
|
||||||
|
%else
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir %{_target_platform}
|
%cmake -DBUILD_TESTS:BOOL=ON
|
||||||
pushd %{_target_platform}
|
%cmake_build
|
||||||
%cmake .. \
|
|
||||||
-DBUILD_TESTS:BOOL=ON
|
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
|
||||||
popd
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
|
%cmake_install
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/pkgconfig
|
||||||
|
install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pkgconfig/websocketpp.pc
|
||||||
|
|
||||||
## unpackaged files
|
## unpackaged files
|
||||||
rm -rfv %{buildroot}%{_includedir}/test_connection/
|
rm -rfv %{buildroot}%{_includedir}/test_connection/
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
make test -C %{_target_platform}
|
%ctest
|
||||||
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
|
|
@ -83,9 +95,137 @@ make test -C %{_target_platform}
|
||||||
%{_includedir}/websocketpp/
|
%{_includedir}/websocketpp/
|
||||||
%dir %{_datadir}/cmake/
|
%dir %{_datadir}/cmake/
|
||||||
%{_datadir}/cmake/websocketpp/
|
%{_datadir}/cmake/websocketpp/
|
||||||
|
%{_datadir}/pkgconfig/websocketpp.pc
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2^git20220525.b9aeec6-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 0.8.2^git20220525.b9aeec6-2
|
||||||
|
- Rebuilt for openssl 4.0
|
||||||
|
|
||||||
|
* Tue Jan 27 2026 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2^git20220525.b9aeec6-1
|
||||||
|
- Update to post-release git snapshot on 0.8.2
|
||||||
|
- Add patch:
|
||||||
|
websocketpp-0.8.2-compatibility_fixes_for_boost_1.87.patch, which
|
||||||
|
fixes FTBFS with Boost 1.90
|
||||||
|
- Update cmake_noarch patch
|
||||||
|
- Drop patches:
|
||||||
|
websocketpp-0.8.2-fix-cmake-find-boost.patch
|
||||||
|
websocketpp-0.8.2-cpp20-fixes.patch
|
||||||
|
websocketpp-0.8.2-cmake40.patch
|
||||||
|
|
||||||
|
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-20
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-19
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 18 2025 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2-18
|
||||||
|
- Add patch: websocketpp-0.8.2-cmake40.patch
|
||||||
|
- Fix CMake 4.0 FTBFS #2381633
|
||||||
|
|
||||||
|
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-17
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 0.8.2-16
|
||||||
|
- convert license to SPDX
|
||||||
|
|
||||||
|
* Wed Jul 24 2024 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2-15
|
||||||
|
- Add dependency on openssl-devel-engine
|
||||||
|
|
||||||
|
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-14
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-13
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Aug 27 2023 Christian Birk <mail@birkc.de> - 0.8.2-12
|
||||||
|
- add patch to fix c++20 compile errors
|
||||||
|
|
||||||
|
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 26 2022 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2-9
|
||||||
|
- Add patch: websocketpp-0.8.2-fix-cmake-find-boost.patch
|
||||||
|
|
||||||
|
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Aug 03 2020 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2-4
|
||||||
|
- Use %%cmake_build and %%cmake_install macros to fix FTBFS
|
||||||
|
|
||||||
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-3
|
||||||
|
- Second attempt - Rebuilt for
|
||||||
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Apr 20 2020 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2-1
|
||||||
|
- New upstream version
|
||||||
|
- Drop patches (fixed upstream):
|
||||||
|
websocketpp-0.8.1-boost_1.70.patch
|
||||||
|
websocketpp-0.8.1-fix_CMakeLists.txt_version_number.patch
|
||||||
|
|
||||||
|
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.1-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.1-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 08 2019 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.1-6
|
||||||
|
- Prepare for Boost 1.70:
|
||||||
|
Add websocketpp-0.8.1-boost_1.70.patch
|
||||||
|
|
||||||
|
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.1-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Nov 07 2018 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.1-4
|
||||||
|
- Add websocketpp-0.8.1-fix_CMakeLists.txt_version_number.patch
|
||||||
|
|
||||||
|
* Wed Nov 07 2018 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.1-3
|
||||||
|
- Add websocketpp.pc to files
|
||||||
|
|
||||||
|
* Wed Oct 31 2018 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.1-2
|
||||||
|
- Update websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patch
|
||||||
|
Disable check for same 32/64bit-ness in websocketpp-configVersion.cmake
|
||||||
|
|
||||||
|
* Thu Jul 26 2018 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.1-1
|
||||||
|
- New upstream version
|
||||||
|
- Added websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patch
|
||||||
|
- The following patches are not needed any more and have been removed:
|
||||||
|
websocketpp-0.7.0-openssl11.patch
|
||||||
|
websocketpp-0.7.0-zlib-permessage-deflate.patch
|
||||||
|
websocketpp-0.7.0-minor-adjustments-to-recent-extension-negotiation.patch
|
||||||
|
- Switch to pkgconfig(openssl) again
|
||||||
|
- Update version and URL in websocketpp.pc
|
||||||
|
|
||||||
|
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-14
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 16 2018 Wolfgang Stöggl <c72578@yahoo.de> - 0.7.0-13
|
||||||
|
- Add BuildRequires: gcc-c++
|
||||||
|
|
||||||
|
* Sun Feb 11 2018 Wolfgang Stöggl <c72578@yahoo.de> - 0.7.0-12
|
||||||
|
- Rebuilt for Boost 1.66
|
||||||
|
|
||||||
|
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-10
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-10
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue