Skip to content

Maintenance commit #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ keywords = ["ftp"]
categories = ["network-programming"]

[features]
# default = ["secure"]

# Enable support of FTPS which requires openssl
secure = ["tokio-rustls"]

Expand All @@ -22,15 +20,14 @@ secure = ["tokio-rustls"]
debug_print = []

[dependencies]
lazy_static = "1.4.0"
regex = "1.3.9"
chrono = "0.4.11"

tokio = { version = "1.0.1", features = ["net", "io-util"] }
tokio-rustls = { version = "0.23.0", optional = true }
lazy_static = "1.4.0"
pin-project = "1.0.0"
regex = "1.3.9"
tokio = { version = "1.0", features = ["net", "io-util"] }
tokio-rustls = { version = "0.24", optional = true }

[dev-dependencies]
tokio = { version = "1.0.1", features = ["macros", "rt"] }
tokio-util = { version = "0.6.0", features = ["io"] }
tokio-stream = "0.1.0"
tokio-util = { version = "0.6.0", features = ["io"] }
12 changes: 8 additions & 4 deletions src/ftp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@ impl FtpStream {
/// };
/// ```
#[cfg(feature = "secure")]
pub async fn into_secure(mut self, config: ClientConfig, domain: ServerName) -> Result<FtpStream> {
pub async fn into_secure(
mut self,
config: ClientConfig,
domain: ServerName,
) -> Result<FtpStream> {
// Ask the server to start securing data.
self.write_str("AUTH TLS\r\n").await?;
self.read_response(status::AUTH_OK).await?;
Expand Down Expand Up @@ -553,9 +557,9 @@ impl FtpStream {
caps[5].parse::<u32>().unwrap(),
caps[6].parse::<u32>().unwrap(),
);
Ok(Some(
Utc.ymd(year, month, day).and_hms(hour, minute, second),
))
Ok(Utc
.with_ymd_and_hms(year, month, day, hour, minute, second)
.latest())
}
None => Ok(None),
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
//!
//! ### FTPS Usage
//!
//! ```rust,no_run
//! ```rust,ignore
//! use std::convert::TryFrom;
//! use std::path::Path;
//! use async_ftp::FtpStream;
Expand Down
2 changes: 1 addition & 1 deletion tests/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::io::Cursor;
#[test]
fn test_ftp() {
let future = async {
let mut ftp_stream = FtpStream::connect("192.168.1.60:21").await?;
let mut ftp_stream = FtpStream::connect(":::21").await?;
let _ = ftp_stream.login("Doe", "mumble").await?;

ftp_stream.mkdir("test_dir").await?;
Expand Down