mirror of
https://github.com/actix/actix-web.git
synced 2024-11-30 05:21:09 +00:00
Merge branch 'master' into ranges
This commit is contained in:
commit
766dde7c42
1 changed files with 2 additions and 2 deletions
|
@ -309,7 +309,7 @@ where
|
||||||
|
|
||||||
/// The socket address to bind
|
/// The socket address to bind
|
||||||
///
|
///
|
||||||
/// To mind multiple addresses this method can be call multiple times.
|
/// To bind multiple addresses this method can be called multiple times.
|
||||||
pub fn bind<S: net::ToSocketAddrs>(mut self, addr: S) -> io::Result<Self> {
|
pub fn bind<S: net::ToSocketAddrs>(mut self, addr: S) -> io::Result<Self> {
|
||||||
let sockets = self.bind2(addr)?;
|
let sockets = self.bind2(addr)?;
|
||||||
self.sockets.extend(sockets);
|
self.sockets.extend(sockets);
|
||||||
|
@ -319,7 +319,7 @@ where
|
||||||
#[cfg(feature = "tls")]
|
#[cfg(feature = "tls")]
|
||||||
/// The ssl socket address to bind
|
/// The ssl socket address to bind
|
||||||
///
|
///
|
||||||
/// To mind multiple addresses this method can be call multiple times.
|
/// To bind multiple addresses this method can be called multiple times.
|
||||||
pub fn bind_tls<S: net::ToSocketAddrs>(
|
pub fn bind_tls<S: net::ToSocketAddrs>(
|
||||||
mut self, addr: S, acceptor: TlsAcceptor,
|
mut self, addr: S, acceptor: TlsAcceptor,
|
||||||
) -> io::Result<Self> {
|
) -> io::Result<Self> {
|
||||||
|
|
Loading…
Reference in a new issue