Subject: [Boost-commit] svn:boost r85759 - trunk/boost/asio/detail/impl
From: chris_at_[hidden]
Date: 2013-09-17 18:06:25
Author: chris_kohlhoff
Date: 2013-09-17 18:06:25 EDT (Tue, 17 Sep 2013)
New Revision: 85759
URL: http://svn.boost.org/trac/boost/changeset/85759
Log:
Inore ERROR_MORE_DATA as a non-fatal error when returned by
GetOverlappedResult for a synchronous read.
Text files modified:
trunk/boost/asio/detail/impl/win_iocp_handle_service.ipp | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
Modified: trunk/boost/asio/detail/impl/win_iocp_handle_service.ipp
==============================================================================
--- trunk/boost/asio/detail/impl/win_iocp_handle_service.ipp Tue Sep 17 18:05:38 2013 (r85758)
+++ trunk/boost/asio/detail/impl/win_iocp_handle_service.ipp 2013-09-17 18:06:25 EDT (Tue, 17 Sep 2013) (r85759)
@@ -440,14 +440,17 @@
if (!ok)
{
DWORD last_error = ::GetLastError();
- if (last_error == ERROR_HANDLE_EOF)
+ if (last_error != ERROR_MORE_DATA)
{
- ec = boost::asio::error::eof;
- }
- else
- {
- ec = boost::system::error_code(last_error,
- boost::asio::error::get_system_category());
+ if (last_error == ERROR_HANDLE_EOF)
+ {
+ ec = boost::asio::error::eof;
+ }
+ else
+ {
+ ec = boost::system::error_code(last_error,
+ boost::asio::error::get_system_category());
+ }
}
return 0;
}