mirror of
https://github.com/pocoproject/poco.git
synced 2024-12-12 18:20:26 +01:00
HTTPServer::stopAll(): close the socket instead of just shutting it down, as the latter won't wake up a select() on Windows
This commit is contained in:
parent
378077f209
commit
d9dd2a81bd
@ -1,18 +1,18 @@
|
||||
This is the changelog file for the POCO C++ Libraries.
|
||||
|
||||
|
||||
Release 1.5.0 (2012-07-04)
|
||||
Release 1.5.0 (2012-07-30)
|
||||
==========================
|
||||
|
||||
- added JSON
|
||||
- added Util::JSONConfiguration
|
||||
- added PDF
|
||||
- added PRoGen
|
||||
- added FIFOBuffer
|
||||
- added FIFOBuffer and FIFOBufferStream
|
||||
- fixed SF# 3522906: Unregistering handlers from SocketReactor
|
||||
- fixed SF# 3522084: AbstractConfiguration does not support 64-bit integers
|
||||
- HTTPServer::stopAll(): close the socket instead of just shutting it down, as the latter won't wake up a select() on Windows
|
||||
|
||||
Release 1.4.4 (2012-04-??)
|
||||
Release 1.4.4 (2012-07-??)
|
||||
==========================
|
||||
|
||||
- ZipStream now builds correctly in unbundled build.
|
||||
|
@ -78,7 +78,8 @@ void HTTPServerConnection::run()
|
||||
try
|
||||
{
|
||||
Poco::FastMutex::ScopedLock lock(_mutex);
|
||||
|
||||
if (!_stopped)
|
||||
{
|
||||
HTTPServerResponseImpl response(session);
|
||||
HTTPServerRequestImpl request(response, session, _pParams);
|
||||
|
||||
@ -108,6 +109,7 @@ void HTTPServerConnection::run()
|
||||
throw;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (NoMessageException&)
|
||||
{
|
||||
break;
|
||||
@ -138,7 +140,7 @@ void HTTPServerConnection::onServerStopped(const bool& abortCurrent)
|
||||
{
|
||||
try
|
||||
{
|
||||
socket().shutdown();
|
||||
socket().close();
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
@ -150,7 +152,7 @@ void HTTPServerConnection::onServerStopped(const bool& abortCurrent)
|
||||
|
||||
try
|
||||
{
|
||||
socket().shutdown();
|
||||
socket().close();
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user