mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2025-04-10 19:21:37 +00:00
BUG/MINOR: sink: free forward_px on deinit()
When a ring section is configured, a new sink is created and forward_px
proxy may be allocated and assigned to the sink.
Such sink-related proxies are added to the sink_proxies_list and thus
don't belong to the main proxy list which is cleaned up in
haproxy deinit() function.
We don't have to manually clean up sink_proxies_list in the main deinit()
func:
sink API already provides the sink_deinit() function so we just add the
missing free_proxy(sink->forward_px) there.
This could be backported up to 2.4.
[in 2.4, commit b0281a49
("MINOR: proxy: check if p is NULL in free_proxy()")
must be backported first]
This commit is contained in:
parent
99a8d0f5d8
commit
9b1d15f53a
@ -2780,6 +2780,10 @@ void deinit(void)
|
|||||||
free_proxy(p0);
|
free_proxy(p0);
|
||||||
}/* end while(p) */
|
}/* end while(p) */
|
||||||
|
|
||||||
|
/* we don't need to free sink_proxies_list proxies since it is
|
||||||
|
* already handled in sink_deinit()
|
||||||
|
*/
|
||||||
|
|
||||||
/* destroy all referenced defaults proxies */
|
/* destroy all referenced defaults proxies */
|
||||||
proxy_destroy_all_unref_defaults();
|
proxy_destroy_all_unref_defaults();
|
||||||
|
|
||||||
|
@ -1368,6 +1368,7 @@ static void sink_deinit()
|
|||||||
}
|
}
|
||||||
LIST_DELETE(&sink->sink_list);
|
LIST_DELETE(&sink->sink_list);
|
||||||
task_destroy(sink->forward_task);
|
task_destroy(sink->forward_task);
|
||||||
|
free_proxy(sink->forward_px);
|
||||||
free(sink->name);
|
free(sink->name);
|
||||||
free(sink->desc);
|
free(sink->desc);
|
||||||
free(sink);
|
free(sink);
|
||||||
|
Loading…
Reference in New Issue
Block a user