nghttpx: Remove user defined ctor/assignment op from DownstreamAddr
This commit is contained in:
parent
eebed206c9
commit
1bd98dcf4f
|
@ -2105,7 +2105,7 @@ void process_options(
|
||||||
auto &addr_groups = downstreamconf.addr_groups;
|
auto &addr_groups = downstreamconf.addr_groups;
|
||||||
|
|
||||||
if (addr_groups.empty()) {
|
if (addr_groups.empty()) {
|
||||||
DownstreamAddr addr;
|
DownstreamAddr addr{};
|
||||||
addr.host = ImmutableString::from_lit(DEFAULT_DOWNSTREAM_HOST);
|
addr.host = ImmutableString::from_lit(DEFAULT_DOWNSTREAM_HOST);
|
||||||
addr.port = DEFAULT_DOWNSTREAM_PORT;
|
addr.port = DEFAULT_DOWNSTREAM_PORT;
|
||||||
|
|
||||||
|
|
|
@ -78,27 +78,6 @@ TicketKeys::~TicketKeys() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DownstreamAddr::DownstreamAddr(const DownstreamAddr &other)
|
|
||||||
: addr(other.addr),
|
|
||||||
host(other.host),
|
|
||||||
hostport(other.hostport),
|
|
||||||
port(other.port),
|
|
||||||
host_unix(other.host_unix) {}
|
|
||||||
|
|
||||||
DownstreamAddr &DownstreamAddr::operator=(const DownstreamAddr &other) {
|
|
||||||
if (this == &other) {
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
addr = other.addr;
|
|
||||||
host = other.host;
|
|
||||||
hostport = other.hostport;
|
|
||||||
port = other.port;
|
|
||||||
host_unix = other.host_unix;
|
|
||||||
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
DownstreamAddrGroup::DownstreamAddrGroup(const DownstreamAddrGroup &other)
|
DownstreamAddrGroup::DownstreamAddrGroup(const DownstreamAddrGroup &other)
|
||||||
: pattern(strcopy(other.pattern)), addrs(other.addrs) {}
|
: pattern(strcopy(other.pattern)), addrs(other.addrs) {}
|
||||||
|
|
||||||
|
@ -1523,7 +1502,7 @@ int parse_config(const char *opt, const char *optarg,
|
||||||
if (!pat_delim) {
|
if (!pat_delim) {
|
||||||
pat_delim = optarg + optarglen;
|
pat_delim = optarg + optarglen;
|
||||||
}
|
}
|
||||||
DownstreamAddr addr;
|
DownstreamAddr addr{};
|
||||||
if (util::istarts_with(optarg, SHRPX_UNIX_PATH_PREFIX)) {
|
if (util::istarts_with(optarg, SHRPX_UNIX_PATH_PREFIX)) {
|
||||||
auto path = optarg + str_size(SHRPX_UNIX_PATH_PREFIX);
|
auto path = optarg + str_size(SHRPX_UNIX_PATH_PREFIX);
|
||||||
addr.host = ImmutableString(path, pat_delim);
|
addr.host = ImmutableString(path, pat_delim);
|
||||||
|
|
|
@ -289,12 +289,6 @@ struct UpstreamAddr {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct DownstreamAddr {
|
struct DownstreamAddr {
|
||||||
DownstreamAddr() : addr{}, port(0), host_unix(false) {}
|
|
||||||
DownstreamAddr(const DownstreamAddr &other);
|
|
||||||
DownstreamAddr(DownstreamAddr &&) = default;
|
|
||||||
DownstreamAddr &operator=(const DownstreamAddr &other);
|
|
||||||
DownstreamAddr &operator=(DownstreamAddr &&other) = default;
|
|
||||||
|
|
||||||
Address addr;
|
Address addr;
|
||||||
// backend address. If |host_unix| is true, this is UNIX domain
|
// backend address. If |host_unix| is true, this is UNIX domain
|
||||||
// socket path.
|
// socket path.
|
||||||
|
|
Loading…
Reference in New Issue