walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Fix failure case when comparing backend address set

This commit is contained in:
Tatsuhiro Tsujikawa 2016-03-23 22:13:53 +09:00
parent 7c954c1ea7
commit 5b58db39ff
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/shrpx_worker.cc
View File

@ -70,14 +70,26 @@ bool match_shared_downstream_addr(
return false; return false;
} }
auto used = std::vector<bool>(lhs->addrs.size());
for (auto &a : lhs->addrs) { for (auto &a : lhs->addrs) {
if (std::find_if(std::begin(rhs->addrs), std::end(rhs->addrs), size_t i;
[&a](const DownstreamAddr &b) { for (i = 0; i < rhs->addrs.size(); ++i) {
return a.host == b.host && a.port == b.port && if (used[i]) {
a.host_unix == b.host_unix; continue;
}) == std::end(rhs->addrs)) { }
auto &b = rhs->addrs[i];
if (a.host == b.host && a.port == b.port && a.host_unix == b.host_unix) {
break;
}
}
if (i == rhs->addrs.size()) {
return false; return false;
} }
used[i] = true;
} }
return true; return true;