Merge branch 'master' into feature/named_file_from_std_file

Cargo.toml

@@ -64,7 +64,7 @@ cell = ["actix-net/cell"]
 actix = "0.7.9"
 actix-net = "0.2.6"
 
-v_htmlescape = "0.3.2"
+v_htmlescape = "0.4"
 base64 = "0.10"
 bitflags = "1.0"
 failure = "^0.1.2"

src/fs.rs

@@ -11,7 +11,7 @@ use std::{cmp, io};
 #[cfg(unix)]
 use std::os::unix::fs::MetadataExt;
 
-use v_htmlescape::HTMLEscape;
+use v_htmlescape::escape as escape_html_entity;
 use bytes::Bytes;
 use futures::{Async, Future, Poll, Stream};
 use futures_cpupool::{CpuFuture, CpuPool};
@@ -620,11 +620,6 @@ macro_rules! encode_file_url {
     };
 }
 
-#[inline]
-fn escape_html_entity(s: &str) -> HTMLEscape {
-    HTMLEscape::from(s)
-}
-
 // " -- &quot;  & -- &amp;  ' -- &#x27;  < -- &lt;  > -- &gt;  / -- &#x2f;
 macro_rules! encode_file_name {
     ($entry:ident) => {

src/server/mod.rs

@@ -303,6 +303,8 @@ pub trait IoStream: AsyncRead + AsyncWrite + 'static {
                         } else {
                             Ok(Async::NotReady)
                         }
+                    } else if e.kind() == io::ErrorKind::ConnectionReset && read_some {
+                        Ok(Async::Ready((read_some, true)))
                     } else {
                         Err(e)
                     };