generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 19:51:58 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'poco-1.10.0' into devel

Browse Source
This commit is contained in:
Günter Obiltschnig
2020-01-17 07:09:25 +01:00
parent 9932be985e ef648dc840
commit cba6914106
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Net/include/Poco/Net/SocketImpl.h
View File

@@ -302,7 +302,7 @@ public:
/// as the system is free to adjust the value. /// as the system is free to adjust the value.
virtual void setReceiveTimeout(const Poco::Timespan& timeout); virtual void setReceiveTimeout(const Poco::Timespan& timeout);
/// Sets the send timeout for the socket. /// Sets the receive timeout for the socket.
/// ///
/// On systems that do not support SO_RCVTIMEO, a /// On systems that do not support SO_RCVTIMEO, a
/// workaround using poll() is provided. /// workaround using poll() is provided.

2
cppignore.win
View File

@@ -17,3 +17,5 @@ class CppUnit::TestCaller<class TimerTest>.testScheduleIntervalClock
class CppUnit::TestCaller<class TimerTest>.testScheduleAtFixedRate class CppUnit::TestCaller<class TimerTest>.testScheduleAtFixedRate
class CppUnit::TestCaller<class SystemConfigurationTest>.testProperties class CppUnit::TestCaller<class SystemConfigurationTest>.testProperties
class CppUnit::TestCaller<class WinServiceTest>.testServiceReturnsTrueIfStopped class CppUnit::TestCaller<class WinServiceTest>.testServiceReturnsTrueIfStopped
class CppUnit::TestCaller<class ICMPSocketTest>.testSendToReceiveFrom
class CppUnit::TestCaller<class ICMPSocketTest>.testMTU