Skip to content

V
varnish-cache
Commit 9784b398 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Merge HAproxy behavioural change 

https://github.com/vtest/VTest/pull/32
parent b26a62dd
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
bin/varnishtest/vtc_haproxy.c
View file @ 9784b398
......@@ -55,7 +55,6 @@
#define HAPROXY_OPT_DAEMON "-D"
#define HAPROXY_SIGNAL SIGINT
#define HAPROXY_EXPECT_EXIT (128 + HAPROXY_SIGNAL)
#define HAPROXY_GOOD_CONF "Configuration file is valid"
struct envar {
VTAILQ_ENTRY(envar) list;
......@@ -1077,8 +1076,9 @@ cmd_haproxy(CMD_ARGS)
if (!strcmp(*av, "-conf-OK")) {
AN(av[1]);
haproxy_store_conf(h, av[1], 0);
h->expect_exit = 0;
haproxy_check_conf(h, "");
av++;
haproxy_check_conf(h, HAPROXY_GOOD_CONF);
continue;
}
if (!strcmp(*av, "-conf-BAD")) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment