commit 57d5b76ece1be3fa23e6c0ad0f7b00aed3338c0a
author Christopher Kohlhoff <chris@kohlhoff.com> Sun Feb 15 16:23:40 2015 +1100
committer Christopher Kohlhoff <chris@kohlhoff.com> Sun Feb 15 16:23:40 2015 +1100
tree 9dd85ce798c40fab2b64a78a83c65d0f7ae8a37f
parent 956979b4458abd89a7e28d9685f8c178d9ca19fd

Fix ssl::stream bug that may cause spurious 'short read' errors.

asio/include/asio/ssl/detail/io.hpp

diff --git a/asio/include/asio/ssl/detail/io.hpp b/asio/include/asio/ssl/detail/io.hpp
index 0916bea..3dfe964 100644
--- a/asio/include/asio/ssl/detail/io.hpp
+++ b/asio/include/asio/ssl/detail/io.hpp
@@ -220,7 +220,9 @@
         }
 
         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_)