Skip to content
Browse files

GH71: WebSocket and broken Timeouts

fixed GH# 71: WebSocket and broken Timeouts (POCO_BROKEN_TIMEOUTS)
  • Loading branch information...
1 parent 6d61386 commit 03530311b8ce1cc7e19703df58efc67ba93015fc @aleks-f aleks-f committed Feb 26, 2013
Showing with 30 additions and 1 deletion.
  1. +1 −0 CHANGELOG
  2. +4 −0 Net/include/Poco/Net/WebSocketImpl.h
  3. +25 −1 Net/src/WebSocketImpl.cpp
View
1 CHANGELOG
@@ -13,6 +13,7 @@ Release 1.5.2 (2013-03-??)
- merged GH #86: Invalid pointers to vector internals (by Adrian Imboden)
- automatic library initialization macros
- fixed GH #110: WebSocket accept() fails when Connection header contains multiple tokens
+- fixed GH# 71: WebSocket and broken Timeouts (POCO_BROKEN_TIMEOUTS)
Release 1.5.1 (2013-01-11)
==========================
View
4 Net/include/Poco/Net/WebSocketImpl.h
@@ -78,6 +78,10 @@ class Net_API WebSocketImpl: public StreamSocketImpl
virtual int receiveFrom(void* buffer, int length, SocketAddress& address, int flags = 0);
virtual void sendUrgent(unsigned char data);
virtual bool secure() const;
+ virtual void setSendTimeout(const Poco::Timespan& timeout);
+ virtual Poco::Timespan getSendTimeout();
+ virtual void setReceiveTimeout(const Poco::Timespan& timeout);
+ virtual Poco::Timespan getReceiveTimeout();
// Internal
int frameFlags() const;
View
26 Net/src/WebSocketImpl.cpp
@@ -297,5 +297,29 @@ bool WebSocketImpl::secure() const
return _pStreamSocketImpl->secure();
}
-
+
+void WebSocketImpl::setSendTimeout(const Poco::Timespan& timeout)
+{
+ _pStreamSocketImpl->setSendTimeout(timeout);
+}
+
+
+Poco::Timespan WebSocketImpl::getSendTimeout()
+{
+ return _pStreamSocketImpl->getSendTimeout();
+}
+
+
+void WebSocketImpl::setReceiveTimeout(const Poco::Timespan& timeout)
+{
+ _pStreamSocketImpl->setReceiveTimeout(timeout);
+}
+
+
+Poco::Timespan WebSocketImpl::getReceiveTimeout()
+{
+ return _pStreamSocketImpl->getReceiveTimeout();
+}
+
+
} } // namespace Poco::Net

0 comments on commit 0353031

Please sign in to comment.
Something went wrong with that request. Please try again.