aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl
diff options
context:
space:
mode:
authorManuel Schölling <[email protected]>2015-03-15 12:52:49 +0100
committerManuel Schölling <[email protected]>2015-04-06 12:22:51 +0200
commit5788f3bec8d7d2594e63f869b265e234b7b38279 (patch)
treeb661d06b3e8b9525d2adf9d048dd923af2accd07 /openssl/src/ssl
parentFix detect_invalid_ipv4 test on OSX (diff)
downloadrust-openssl-5788f3bec8d7d2594e63f869b265e234b7b38279.tar.xz
rust-openssl-5788f3bec8d7d2594e63f869b265e234b7b38279.zip
Use latest OpenSSL version in travis tests and more verbose error message in ConnectedSocket
Diffstat (limited to 'openssl/src/ssl')
-rw-r--r--openssl/src/ssl/connected_socket.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/openssl/src/ssl/connected_socket.rs b/openssl/src/ssl/connected_socket.rs
index 59b5cb7b..84414940 100644
--- a/openssl/src/ssl/connected_socket.rs
+++ b/openssl/src/ssl/connected_socket.rs
@@ -213,7 +213,8 @@ impl<S: AsRawFd+?Sized> Read for ConnectedSocket<S> {
match errno() {
EAGAIN => Err(Error::new(ErrorKind::Interrupted, "EAGAIN", None)),
_ => Err(Error::new(ErrorKind::Other,
- "recv() returned -1", None)),
+ "recv() returned -1",
+ Some(os::error_string(os::errno() as i32)))),
}
},
0 => Err(Error::new(ErrorKind::Other,
@@ -234,7 +235,9 @@ impl<S: AsRawFd+?Sized> Write for ConnectedSocket<S> {
if res == (buf.len() as i64) {
Ok(res as usize)
} else {
- Err(Error::new(ErrorKind::Other, "send() failed", Some(os::error_string(os::errno() as i32))))
+ Err(Error::new(ErrorKind::Other,
+ "send() failed",
+ Some(os::error_string(os::errno() as i32))))
}
}