Commit 33ef9e0b authored by Pavel Vainerman's avatar Pavel Vainerman

backported to p9 as 2.9.4-alt0.M90P.0.7 (with rpmbph script)

parents 4e6b2dbe 82f261e6
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
Name: libuniset2 Name: libuniset2
Version: 2.9.4 Version: 2.9.4
Release: alt0.M90P.0.6 Release: alt0.M90P.0.7
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
License: LGPL-2.1 License: LGPL-2.1
...@@ -558,6 +558,7 @@ rm -f %buildroot%_docdir/%oname/html/*.md5 ...@@ -558,6 +558,7 @@ rm -f %buildroot%_docdir/%oname/html/*.md5
%if_enabled api %if_enabled api
%files extension-wsgate %files extension-wsgate
%_bindir/%oname-wsgate* %_bindir/%oname-wsgate*
%_libdir/libUniSet2UWebSocketGate*.so.*
%files extension-wsgate-devel %files extension-wsgate-devel
%_pkgconfigdir/libUniSet2UWebSocketGate*.pc %_pkgconfigdir/libUniSet2UWebSocketGate*.pc
...@@ -588,9 +589,12 @@ rm -f %buildroot%_docdir/%oname/html/*.md5 ...@@ -588,9 +589,12 @@ rm -f %buildroot%_docdir/%oname/html/*.md5
# history of current unpublished changes # history of current unpublished changes
%changelog %changelog
* Wed Mar 31 2021 Pavel Vainerman <pv@altlinux.ru> 2.9.4-alt0.M90P.0.6 * Thu Apr 01 2021 Pavel Vainerman <pv@altlinux.ru> 2.9.4-alt0.M90P.0.7
- backport to ALTLinux p9 (by rpmbph script) - backport to ALTLinux p9 (by rpmbph script)
* Thu Apr 01 2021 Pavel Vainerman <pv@altlinux.ru> 2.9.4-alt0.7
- test build
* Wed Mar 31 2021 Pavel Vainerman <pv@altlinux.ru> 2.9.4-alt0.6 * Wed Mar 31 2021 Pavel Vainerman <pv@altlinux.ru> 2.9.4-alt0.6
- test build for websocketgate (wsgate-devel package) - test build for websocketgate (wsgate-devel package)
......
...@@ -17,9 +17,9 @@ libUniSet2UWebSocketGate_la_CXXFLAGS = -I$(top_builddir)/extensions/include \ ...@@ -17,9 +17,9 @@ libUniSet2UWebSocketGate_la_CXXFLAGS = -I$(top_builddir)/extensions/include \
@PACKAGE@_wsgate_SOURCES = main.cc @PACKAGE@_wsgate_SOURCES = main.cc
@PACKAGE@_wsgate_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS) @PACKAGE@_wsgate_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
@PACKAGE@_wsgate_LDADD = libUniSet2UWebSocketGate.la $(top_builddir)/lib/libUniSet2.la \ @PACKAGE@_wsgate_LDADD = libUniSet2UWebSocketGate.la $(top_builddir)/lib/libUniSet2.la \
$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \ $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
$(top_builddir)/extensions/lib/libUniSet2Extensions.la \ $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(SIGC_LIBS) $(POCO_LIBS) $(SIGC_LIBS) $(POCO_LIBS)
# install # install
......
...@@ -805,11 +805,10 @@ void UWebSocketGate::UWebSocket::read( ev::io& io, int revents ) ...@@ -805,11 +805,10 @@ void UWebSocketGate::UWebSocket::read( ev::io& io, int revents )
} }
if( (flags & WebSocket::FRAME_OP_BITMASK) & WebSocket::FRAME_OP_PONG ) if( (flags & WebSocket::FRAME_OP_BITMASK) & WebSocket::FRAME_OP_PONG )
{ {
mylog4 << req->clientAddress().toString() << "(read): pong.." << endl; mylog4 << req->clientAddress().toString() << "(read): pong.." << endl;
return; return;
} }
if( (flags & WebSocket::FRAME_OP_BITMASK) == WebSocket::FRAME_OP_CLOSE ) if( (flags & WebSocket::FRAME_OP_BITMASK) == WebSocket::FRAME_OP_CLOSE )
{ {
...@@ -1129,10 +1128,10 @@ void UWebSocketGate::UWebSocket::write() ...@@ -1129,10 +1128,10 @@ void UWebSocketGate::UWebSocket::write()
int flags = WebSocket::FRAME_TEXT; int flags = WebSocket::FRAME_TEXT;
if( msg->len == ping_str.size() ) if( msg->len == ping_str.size() )
{ {
flags = WebSocket::FRAME_FLAG_FIN | WebSocket::FRAME_OP_PING; flags = WebSocket::FRAME_FLAG_FIN | WebSocket::FRAME_OP_PING;
mylog4 << req->clientAddress().toString() << "(write): ping.." << endl; mylog4 << req->clientAddress().toString() << "(write): ping.." << endl;
} }
try try
{ {
......
...@@ -265,7 +265,7 @@ TEST_CASE("[UWebSocketGate]: del", "[uwebsocketgate]") ...@@ -265,7 +265,7 @@ TEST_CASE("[UWebSocketGate]: del", "[uwebsocketgate]")
ws.receiveFrame(buffer, sizeof(buffer), flags); ws.receiveFrame(buffer, sizeof(buffer), flags);
string str(buffer); string str(buffer);
REQUIRE( str.find("Ping") != string::npos ); REQUIRE( str == "." );
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
TEST_CASE("[UWebSocketGate]: get", "[uwebsocketgate]") TEST_CASE("[UWebSocketGate]: get", "[uwebsocketgate]")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment