Changes made to support 0.12.0-dev ( October 2, 2014 )

This commit is contained in:
D.K 2014-10-02 14:42:28 -04:00 committed by Steven Fackler
parent c09ec835fa
commit 09ecc7e521
2 changed files with 3 additions and 5 deletions

View File

@ -171,14 +171,12 @@ pub static X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE: c_int = 45;
pub static X509_V_ERR_UNSUPPORTED_NAME_SYNTAX: c_int = 53; pub static X509_V_ERR_UNSUPPORTED_NAME_SYNTAX: c_int = 53;
pub static X509_V_OK: c_int = 0; pub static X509_V_OK: c_int = 0;
#[cfg(target_os = "macos", feature = "tlsv1_1")] #[cfg( any( all(target_os = "macos", feature = "tlsv1_1"),all(target_os = "macos", feature = "tlsv1_2")))]
#[cfg(target_os = "macos", feature = "tlsv1_2")]
#[link(name="ssl.1.0.0")] #[link(name="ssl.1.0.0")]
#[link(name="crypto.1.0.0")] #[link(name="crypto.1.0.0")]
extern {} extern {}
#[cfg(not(target_os = "macos"))] #[cfg(any( not( target_os = "macos"), all(target_os = "macos", not(feature = "tlsv1_1"), not(feature = "tlsv1_2"))))]
#[cfg(target_os = "macos", not(feature = "tlsv1_1"), not(feature = "tlsv1_2"))]
#[link(name="ssl")] #[link(name="ssl")]
#[link(name="crypto")] #[link(name="crypto")]
extern {} extern {}

View File

@ -494,7 +494,7 @@ impl<S: Stream> Writer for SslStream<S> {
let mut start = 0; let mut start = 0;
while start < buf.len() { while start < buf.len() {
let ret = self.in_retry_wrapper(|ssl| { let ret = self.in_retry_wrapper(|ssl| {
ssl.write(buf.slice_from(start)) ssl.write(buf.split_at(start).val1())
}); });
match ret { match ret {
Ok(len) => start += len as uint, Ok(len) => start += len as uint,