Mirrors/privacore-open-source-search-engine
1
0
Fork 1
mirror of https://github.com/privacore/open-source-search-engine.git synced 2025-07-13 02:36:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into nomerge2

Browse Source 
Conflicts:
	UdpServer.cpp
This commit is contained in:
Ivan Skytte Jørgensen
2016-09-12 12:46:05 +02:00
parent b8621d5af0 6e91c3873e
commit 8876b62add
1 changed files with 1 additions and 1 deletions

2
UdpServer.cpp

@ -2289,8 +2289,8 @@ bool UdpServer::timeoutDeadHosts ( Host *h ) {
// and proxy1 do...
if ( h->m_isProxy ) return true;
ScopedLock sl(m_mtx);
// find sockets out to dead hosts and change the timeout
ScopedLock sl(m_mtx);
for ( UdpSlot *slot = m_activeListHead ; slot ; slot = slot->m_activeListNext ) {
// only change requests to dead hosts
if ( slot->getHostId() < 0 ) continue;