Merge branch 'release-v0.9.6' into release

Author: sfackler

Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "postgres"
-version = "0.9.5"
+version = "0.9.6"
 authors = ["Steven Fackler <[email protected]>"]
 license = "MIT"
 description = "A native PostgreSQL driver"
 repository = "https://github.com/sfackler/rust-postgres"
-documentation = "https://sfackler.github.io/rust-postgres/doc/v0.9.5/postgres"
+documentation = "https://sfackler.github.io/rust-postgres/doc/v0.9.6/postgres"
 readme = "README.md"
 keywords = ["database", "sql"]
 build = "build.rs"
@@ -31,7 +31,7 @@ log = "0.3"
 phf = "0.7"
 rustc-serialize = "0.3"
 chrono = { version = "0.2.14", optional = true }
-openssl = { version = "0.6", optional = true }
+openssl = { version = "0.6.4", optional = true }
 serde = { version = "0.3", optional = true }
 time = { version = "0.1.14", optional = true }
 unix_socket = { version = ">= 0.3, < 0.5", optional = true }

README.md

@@ -1,7 +1,7 @@
 # Rust-Postgres
 A native PostgreSQL driver for Rust.
 
-[Documentation](https://sfackler.github.io/rust-postgres/doc/v0.9.5/postgres)
+[Documentation](https://sfackler.github.io/rust-postgres/doc/v0.9.6/postgres)
 
 [![Build Status](https://travis-ci.org/sfackler/rust-postgres.png?branch=master)](https://travis-ci.org/sfackler/rust-postgres) [![Latest Version](https://img.shields.io/crates/v/postgres.svg)](https://crates.io/crates/postgres)
 

src/error.rs

@@ -350,3 +350,9 @@ impl From<byteorder::Error> for Error {
         Error::IoError(From::from(err))
     }
 }
+
+impl From<Error> for io::Error {
+    fn from(err: Error) -> io::Error {
+        io::Error::new(io::ErrorKind::Other, err)
+    }
+}

src/io/openssl.rs

@@ -18,7 +18,7 @@ impl StreamWrapper for SslStream<Stream> {
 impl NegotiateSsl for SslContext {
     fn negotiate_ssl(&self, _: &str, stream: Stream)
                      -> Result<Box<StreamWrapper>, Box<Error+Send+Sync>> {
-        let stream = try!(SslStream::new(self, stream));
+        let stream = try!(SslStream::connect(self, stream));
         Ok(Box::new(stream))
     }
 }