as far as I remember RFC, if the client sets "Connection: Close", so the server must also close connection. it is possible to set "Connection: close" unconditionally (as it was before your patch). is it allowed to set KA unconditionally ?
вт, 12 янв. 2021 г. в 00:11, William Dauchy <[email protected]>: > it does not seem to have a reason to close connections after each > request; reflect that in tests by doing all requests within the same > client. > > Signed-off-by: William Dauchy <[email protected]> > --- > contrib/prometheus-exporter/service-prometheus.c | 1 - > reg-tests/contrib/prometheus.vtc | 8 -------- > 2 files changed, 9 deletions(-) > > diff --git a/contrib/prometheus-exporter/service-prometheus.c > b/contrib/prometheus-exporter/service-prometheus.c > index beca87959..63ccdd155 100644 > --- a/contrib/prometheus-exporter/service-prometheus.c > +++ b/contrib/prometheus-exporter/service-prometheus.c > @@ -2459,7 +2459,6 @@ static int promex_send_headers(struct appctx > *appctx, struct stream_interface *s > goto full; > sl->info.res.status = 200; > if (!htx_add_header(htx, ist("Cache-Control"), ist("no-cache")) || > - !htx_add_header(htx, ist("Connection"), ist("close")) || > !htx_add_header(htx, ist("Content-Type"), ist("text/plain; > version=0.0.4")) || > !htx_add_header(htx, ist("Transfer-Encoding"), ist("chunked")) > || > !htx_add_endof(htx, HTX_BLK_EOH)) > diff --git a/reg-tests/contrib/prometheus.vtc > b/reg-tests/contrib/prometheus.vtc > index 64b9cc0bc..de884b1ad 100644 > --- a/reg-tests/contrib/prometheus.vtc > +++ b/reg-tests/contrib/prometheus.vtc > @@ -37,22 +37,16 @@ client c1 -connect ${h1_stats_sock} { > expect resp.body ~ ".*haproxy_frontend.*" > expect resp.body ~ ".*haproxy_backend.*" > expect resp.body ~ ".*haproxy_server.*" > -} -run > > -client c2 -connect ${h1_stats_sock} { > txreq -url "/metrics?scope" > rxresp > expect resp.status == 400 > -} -run > > -client c3 -connect ${h1_stats_sock} { > txreq -url "/metrics?scope=" > rxresp > expect resp.status == 200 > expect resp.bodylen == 0 > -} -run > > -client c4 -connect ${h1_stats_sock} { > txreq -url "/metrics?scope=server" > rxresp > expect resp.status == 200 > @@ -60,9 +54,7 @@ client c4 -connect ${h1_stats_sock} { > expect resp.body !~ ".*haproxy_frontend.*" > expect resp.body !~ ".*haproxy_backend.*" > expect resp.body ~ ".*haproxy_server.*" > -} -run > > -client c5 -connect ${h1_stats_sock} { > txreq -url "/metrics?scope=frontend&scope=backend" > rxresp > expect resp.status == 200 > -- > 2.29.2 > > >
