diff options
Diffstat (limited to 'boost/asio/ssl/detail/io.hpp')
| -rw-r--r-- | boost/asio/ssl/detail/io.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/boost/asio/ssl/detail/io.hpp b/boost/asio/ssl/detail/io.hpp index ef821000ba..2e889ec8b0 100644 --- a/boost/asio/ssl/detail/io.hpp +++ b/boost/asio/ssl/detail/io.hpp @@ -2,7 +2,7 @@ // ssl/detail/io.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2014 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2015 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -225,7 +225,9 @@ public: } default: - if (bytes_transferred != ~std::size_t(0) && !ec_) + if (bytes_transferred == ~std::size_t(0)) + bytes_transferred = 0; // Timer cancellation, no data transferred. + else if (!ec_) ec_ = ec; switch (want_) |