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

Net::HTTPSession: split timeout to connection, recieve, send

Browse Source
This commit is contained in:
proller
2017-01-11 19:19:49 +03:00
parent 2829032bba
commit cc2f754d4d
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Net/include/Poco/Net/HTTPSession.h
View File

@@ -55,7 +55,10 @@ public:
void setTimeout(const Poco::Timespan& timeout); void setTimeout(const Poco::Timespan& timeout);
/// Sets the timeout for the HTTP session. /// Sets the timeout for the HTTP session.
void setTimeout(const Poco::Timespan& connectionTimeout, const Poco::Timespan& sendTimeout, const Poco::Timespan& receiveTimeout);
/// Sets different timeouts for the HTTP session.
Poco::Timespan getTimeout() const; Poco::Timespan getTimeout() const;
/// Returns the timeout for the HTTP session. /// Returns the timeout for the HTTP session.
@@ -171,7 +174,8 @@ protected:
private: private:
enum enum
{ {
HTTP_DEFAULT_TIMEOUT = 60000000 HTTP_DEFAULT_TIMEOUT = 60000000,
HTTP_DEFAULT_CONNECTION_TIMEOUT = 30000000
}; };
HTTPSession(const HTTPSession&); HTTPSession(const HTTPSession&);
@@ -182,7 +186,9 @@ private:
char* _pCurrent; char* _pCurrent;
char* _pEnd; char* _pEnd;
bool _keepAlive; bool _keepAlive;
Poco::Timespan _timeout; Poco::Timespan _connectionTimeout;
Poco::Timespan _receiveTimeout;
Poco::Timespan _sendTimeout;
Poco::Exception* _pException; Poco::Exception* _pException;
Poco::Any _data; Poco::Any _data;
@@ -204,7 +210,7 @@ inline bool HTTPSession::getKeepAlive() const
inline Poco::Timespan HTTPSession::getTimeout() const inline Poco::Timespan HTTPSession::getTimeout() const
{ {
return _timeout; return _receiveTimeout;
} }

26
Net/src/HTTPSession.cpp
View File

@@ -32,7 +32,9 @@ HTTPSession::HTTPSession():
_pCurrent(0), _pCurrent(0),
_pEnd(0), _pEnd(0),
_keepAlive(false), _keepAlive(false),
_timeout(HTTP_DEFAULT_TIMEOUT), _connectionTimeout(HTTP_DEFAULT_CONNECTION_TIMEOUT),
_receiveTimeout(HTTP_DEFAULT_TIMEOUT),
_sendTimeout(HTTP_DEFAULT_TIMEOUT),
_pException(0) _pException(0)
{ {
} }
@@ -44,7 +46,9 @@ HTTPSession::HTTPSession(const StreamSocket& socket):
_pCurrent(0), _pCurrent(0),
_pEnd(0), _pEnd(0),
_keepAlive(false), _keepAlive(false),
_timeout(HTTP_DEFAULT_TIMEOUT), _connectionTimeout(HTTP_DEFAULT_CONNECTION_TIMEOUT),
_receiveTimeout(HTTP_DEFAULT_TIMEOUT),
_sendTimeout(HTTP_DEFAULT_TIMEOUT),
_pException(0) _pException(0)
{ {
} }
@@ -56,7 +60,9 @@ HTTPSession::HTTPSession(const StreamSocket& socket, bool keepAlive):
_pCurrent(0), _pCurrent(0),
_pEnd(0), _pEnd(0),
_keepAlive(keepAlive), _keepAlive(keepAlive),
_timeout(HTTP_DEFAULT_TIMEOUT), _connectionTimeout(HTTP_DEFAULT_CONNECTION_TIMEOUT),
_receiveTimeout(HTTP_DEFAULT_TIMEOUT),
_sendTimeout(HTTP_DEFAULT_TIMEOUT),
_pException(0) _pException(0)
{ {
} }
@@ -91,7 +97,14 @@ void HTTPSession::setKeepAlive(bool keepAlive)
void HTTPSession::setTimeout(const Poco::Timespan& timeout) void HTTPSession::setTimeout(const Poco::Timespan& timeout)
{ {
_timeout = timeout; setTimeout(timeout, timeout, timeout);
}
void HTTPSession::setTimeout(const Poco::Timespan& connectionTimeout, const Poco::Timespan& sendTimeout, const Poco::Timespan& receiveTimeout)
{
_connectionTimeout = connectionTimeout;
_sendTimeout = sendTimeout;
_receiveTimeout = receiveTimeout;
} }
@@ -181,8 +194,9 @@ bool HTTPSession::connected() const
void HTTPSession::connect(const SocketAddress& address) void HTTPSession::connect(const SocketAddress& address)
{ {
_socket.connect(address, _timeout); _socket.connect(address, _connectionTimeout);
_socket.setReceiveTimeout(_timeout); _socket.setReceiveTimeout(_receiveTimeout);
_socket.setSendTimeout(_sendTimeout);
_socket.setNoDelay(true); _socket.setNoDelay(true);
// There may be leftover data from a previous (failed) request in the buffer, // There may be leftover data from a previous (failed) request in the buffer,
// so we clear it. // so we clear it.