Browse Source

Reset variables that will affect functioning of recycled proxies

master
Con Kolivas 10 years ago
parent
commit
81370d2c87
  1. 3
      src/generator.c

3
src/generator.c

@ -1608,9 +1608,11 @@ static proxy_instance_t *create_subproxy(gdata_t *gdata, proxy_instance_t *proxi
/* Recycle an old proxy instance if one exists */ /* Recycle an old proxy instance if one exists */
subproxy = gdata->dead_proxies; subproxy = gdata->dead_proxies;
DL_DELETE(gdata->dead_proxies, subproxy); DL_DELETE(gdata->dead_proxies, subproxy);
subproxy->disabled = false;
} else { } else {
subproxy = ckzalloc(sizeof(proxy_instance_t)); subproxy = ckzalloc(sizeof(proxy_instance_t));
subproxy->cs = ckzalloc(sizeof(connsock_t)); subproxy->cs = ckzalloc(sizeof(connsock_t));
mutex_init(&subproxy->share_lock);
} }
mutex_unlock(&gdata->lock); mutex_unlock(&gdata->lock);
@ -1621,7 +1623,6 @@ static proxy_instance_t *create_subproxy(gdata_t *gdata, proxy_instance_t *proxi
subproxy->pass = proxi->pass; subproxy->pass = proxi->pass;
subproxy->proxy = proxi; subproxy->proxy = proxi;
subproxy->epfd = proxi->epfd; subproxy->epfd = proxi->epfd;
mutex_init(&subproxy->share_lock);
return subproxy; return subproxy;
} }

Loading…
Cancel
Save