From 4d5ef2a76a6686995e2884c03ab3f8166bd5cc84 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Sun, 15 Feb 2015 14:18:35 +1100 Subject: [PATCH] Don't try to recruit extra subproxies on initial connect --- src/generator.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/generator.c b/src/generator.c index 0c96851a..4a58371c 100644 --- a/src/generator.c +++ b/src/generator.c @@ -1530,7 +1530,6 @@ static void drop_subproxies(proxy_instance_t *proxi) static bool proxy_alive(ckpool_t *ckp, server_instance_t *si, proxy_instance_t *proxi, connsock_t *cs, bool pinging, int epfd) { - gdata_t *gdata = ckp->data; struct epoll_event event; bool ret = false; @@ -1589,20 +1588,6 @@ out: cs->fd, epfd); return false; } - if (!ckp->passthrough && parent_proxy(proxi)) { - /* We recruit enough proxies to begin with and then - * recruit extra when asked by the stratifier. */ - while (proxi->client_headroom < 42) { - /* Note recursive call of proxy_alive here */ - if (!recruit_subproxy(gdata, proxi)) { - LOGWARNING("Unable to recruit extra subproxies after just %"PRId64, - proxi->client_headroom); - break; - } - LOGWARNING("Proxy %d:%s recruited extra subproxy!", - proxi->id, cs->url); - } - } } proxi->alive = ret; if (!ret && parent_proxy(proxi))