The legacy HTTP subsystem has been removed. HTX is always enabled.
---
reg-tests/README | 2 +-
reg-tests/cache/basic.vtc | 1 -
reg-tests/cache/caching_rules.vtc | 1 -
reg-tests/cache/expires.vtc | 1 -
reg-tests/cache/if-modified-since.vtc | 1 -
reg-tests/cache/if-none-match.vtc | 1 -
reg-tests/cache/post_on_entry.vtc | 1 -
reg-tests/cache/sample_fetches.vtc| 1 -
reg-tests/cache/vary.vtc | 1 -
reg-tests/cache/vary_accept_encoding.vtc | 1 -
reg-tests/compression/basic.vtc | 1 -
reg-tests/compression/etags_conversion.vtc| 1 -
reg-tests/compression/lua_validation.vtc | 1 -
reg-tests/compression/vary.vtc| 1 -
reg-tests/connection/dispatch.vtc | 1 -
.../connection/proxy_protocol_random_fail.vtc | 1 -
reg-tests/filters/random-forwarding.vtc | 1 -
reg-tests/http-capture/multiple_headers.vtc | 1 -
.../http-cookies/cookie_insert_indirect.vtc | 1 -
reg-tests/http-messaging/h1_to_h1.vtc | 1 -
reg-tests/http-messaging/h2_to_h1.vtc | 1 -
.../http-messaging/http_abortonclose.vtc | 1 -
.../http-messaging/http_bodyless_response.vtc | 1 -
.../http-messaging/http_request_buffer.vtc| 1 -
.../http-messaging/http_wait_for_body.vtc | 1 -
reg-tests/http-messaging/protocol_upgrade.vtc | 1 -
reg-tests/http-messaging/websocket.vtc| 3 ---
reg-tests/http-rules/acl_cli_spaces.vtc | 1 -
...erters_ipmask_concat_strcmp_field_word.vtc | 2 --
reg-tests/http-rules/h1or2_to_h1c.vtc | 1 -
reg-tests/http-rules/map_redirect.vtc | 1 -
.../http-rules/map_regm_with_backref.vtc | 1 -
reg-tests/lua/bad_http_clt_req_duration.vtc | 2 --
reg-tests/lua/close_wait_lf.vtc | 1 -
reg-tests/lua/h_txn_get_priv.vtc | 2 --
reg-tests/lua/lua_socket.vtc | 2 --
reg-tests/lua/set_var.vtc | 2 --
reg-tests/lua/txn_get_priv-thread.vtc | 3 ---
reg-tests/lua/txn_get_priv.vtc| 3 ---
reg-tests/lua/wrong_types_usage.vtc | 2 --
reg-tests/mcli/mcli_show_info.vtc | 1 -
reg-tests/mcli/mcli_start_progs.vtc | 1 -
reg-tests/seamless-reload/abns_socket.vtc | 1 -
reg-tests/server/cli_add_server.vtc | 1 -
reg-tests/server/cli_delete_server.vtc| 1 -
reg-tests/server/cli_set_fdqn.vtc | 1 -
reg-tests/server/cli_set_ssl.vtc | 1 -
reg-tests/ssl/add_ssl_crt-list.vtc| 2 --
reg-tests/ssl/del_ssl_crt-list.vtc| 3 ---
reg-tests/ssl/new_del_ssl_cafile.vtc | 1 -
reg-tests/ssl/new_del_ssl_crlfile.vtc | 1 -
reg-tests/ssl/set_ssl_cafile.vtc | 1 -
reg-tests/ssl/set_ssl_cert.vtc| 1 -
reg-tests/ssl/set_ssl_cert_bundle.vtc | 1 -
reg-tests/ssl/set_ssl_cert_noext.vtc | 1 -
reg-tests/ssl/set_ssl_crlfile.vtc | 1 -
reg-tests/ssl/set_ssl_server_cert.vtc | 1 -
reg-tests/ssl/ssl_client_auth.vtc | 1 -
reg-tests/ssl/ssl_client_samples.vtc | 2 --
reg-tests/ssl/ssl_crt-list_filters.vtc| 1 -
reg-tests/ssl/ssl_frontend_samples.vtc| 2 --
reg-tests/ssl/ssl_server_samples.vtc | 2 --
reg-tests/ssl/ssl_simple_crt-list.vtc | 1 -
reg-tests/ssl/wrong_ctx_storage.vtc | 1 -
.../converteers_ref_cnt_never_dec.vtc | 1 -
reg-tests/stick-table/src_conn_rate.vtc | 1 -
reg-tests/stick-table/unknown_key.vtc | 1 -
reg-tests/stickiness/lb-services.vtc | 2 --
reg-tests/stickiness/srvkey-addr.vtc | 2 --
.../webstats-scope-and-post-change.vtc| 1 -
scripts/run-regtests.sh | 22 +--
71 files changed, 2 insertions(+), 111 deletions(-)
diff --git a/reg-tests/README b/reg-tests/README
index d05a2a805..6993d9782 100644
--- a/reg-tests/README
+++ b/reg-tests/README
@@ -38,7 +38,7 @@ See also: doc/regression-testing.txt
You must set HAPROXY_PROGRAM environment variable to give the location
of the HAProxy program to test to vtest:
-$ HAPROXY_PROGRAM= vtest [-Dno-htx=] ...
+$ HAPROXY_PROGRAM= vtest ...
The HAProxy VTC files found in HAProxy sources may be run with the reg-tests
Makefile target. You must set the VTEST_PROGRAM environment variable to
diff --git a/reg-tests/cache/basic.vtc b/reg-tests/cache/basic.vtc
index 849057d9e..30f463108 100644
--- a/reg-tests/cache/basic.vtc
+++ b/reg-tests/cache/basic.vtc
@@ -27,7 +27,6 @@ server s1 {
haproxy h1 -conf {
defaults
mode http
-${no-htx} option http-use-htx
timeout connect 1s
timeout client 1s
timeout server 1s
diff --git a/reg-tests/cache/caching_rules.vtc
b/reg-tests/cache/caching_rules.vtc
index
