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=<my haproxy program> vtest [-Dno-htx=] ...
+ $ HAPROXY_PROGRAM=<my 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 114b2fd91..c65bc4ba5 100644
--- a/reg-tests/cache/caching_rules.vtc
+++ b/reg-tests/cache/caching_rules.vtc
@@ -86,7 +86,6 @@ 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/expires.vtc b/reg-tests/cache/expires.vtc
index 037f09fd0..309c4ae6a 100644
--- a/reg-tests/cache/expires.vtc
+++ b/reg-tests/cache/expires.vtc
@@ -48,7 +48,6 @@ 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/if-modified-since.vtc
b/reg-tests/cache/if-modified-since.vtc
index 8ae1cce5d..d3c9b70ed 100644
--- a/reg-tests/cache/if-modified-since.vtc
+++ b/reg-tests/cache/if-modified-since.vtc
@@ -48,7 +48,6 @@ 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/if-none-match.vtc
b/reg-tests/cache/if-none-match.vtc
index ba3336a08..bb5b9b567 100644
--- a/reg-tests/cache/if-none-match.vtc
+++ b/reg-tests/cache/if-none-match.vtc
@@ -33,7 +33,6 @@ 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/post_on_entry.vtc
b/reg-tests/cache/post_on_entry.vtc
index db6414ed4..b24cfd666 100644
--- a/reg-tests/cache/post_on_entry.vtc
+++ b/reg-tests/cache/post_on_entry.vtc
@@ -25,7 +25,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/sample_fetches.vtc
b/reg-tests/cache/sample_fetches.vtc
index 973b3ad61..add6366eb 100644
--- a/reg-tests/cache/sample_fetches.vtc
+++ b/reg-tests/cache/sample_fetches.vtc
@@ -52,7 +52,6 @@ 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/vary.vtc b/reg-tests/cache/vary.vtc
index 0b5d13941..61d7af671 100644
--- a/reg-tests/cache/vary.vtc
+++ b/reg-tests/cache/vary.vtc
@@ -135,7 +135,6 @@ 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/vary_accept_encoding.vtc
b/reg-tests/cache/vary_accept_encoding.vtc
index 852ac293e..748c310c3 100644
--- a/reg-tests/cache/vary_accept_encoding.vtc
+++ b/reg-tests/cache/vary_accept_encoding.vtc
@@ -100,7 +100,6 @@ 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/compression/basic.vtc b/reg-tests/compression/basic.vtc
index 6154e66c5..1df229302 100644
--- a/reg-tests/compression/basic.vtc
+++ b/reg-tests/compression/basic.vtc
@@ -180,7 +180,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/compression/etags_conversion.vtc
b/reg-tests/compression/etags_conversion.vtc
index 48e7955fc..901a5efa7 100644
--- a/reg-tests/compression/etags_conversion.vtc
+++ b/reg-tests/compression/etags_conversion.vtc
@@ -114,7 +114,6 @@ 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/compression/lua_validation.vtc
b/reg-tests/compression/lua_validation.vtc
index af234b3d1..d001c2d32 100644
--- a/reg-tests/compression/lua_validation.vtc
+++ b/reg-tests/compression/lua_validation.vtc
@@ -15,7 +15,6 @@ global
defaults
mode http
log global
- ${no-htx} option http-use-htx
option httplog
frontend main-https
diff --git a/reg-tests/compression/vary.vtc b/reg-tests/compression/vary.vtc
index a905f9c94..ec6341b3f 100644
--- a/reg-tests/compression/vary.vtc
+++ b/reg-tests/compression/vary.vtc
@@ -69,7 +69,6 @@ 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/connection/dispatch.vtc
b/reg-tests/connection/dispatch.vtc
index bac19d8fd..fccd6ec4b 100644
--- a/reg-tests/connection/dispatch.vtc
+++ b/reg-tests/connection/dispatch.vtc
@@ -26,7 +26,6 @@ listen fe_tcp
listen fe_http
bind "fd@${fe_http}"
mode http
- ${no-htx} option http-use-htx
dispatch ${s2_addr}:${s2_port}
} -start
diff --git a/reg-tests/connection/proxy_protocol_random_fail.vtc
b/reg-tests/connection/proxy_protocol_random_fail.vtc
index 983857733..135908e64 100644
--- a/reg-tests/connection/proxy_protocol_random_fail.vtc
+++ b/reg-tests/connection/proxy_protocol_random_fail.vtc
@@ -31,7 +31,6 @@ haproxy h1 -conf {
defaults
mode http
- ${no-htx} option http-use-htx
timeout client 1s
timeout server 1s
timeout connect 1s
diff --git a/reg-tests/filters/random-forwarding.vtc
b/reg-tests/filters/random-forwarding.vtc
index 2982c880f..07dd2b85c 100644
--- a/reg-tests/filters/random-forwarding.vtc
+++ b/reg-tests/filters/random-forwarding.vtc
@@ -42,7 +42,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/http-capture/multiple_headers.vtc
b/reg-tests/http-capture/multiple_headers.vtc
index 378838ee4..f16b37ed9 100644
--- a/reg-tests/http-capture/multiple_headers.vtc
+++ b/reg-tests/http-capture/multiple_headers.vtc
@@ -41,7 +41,6 @@ server s {
haproxy h -conf {
defaults
mode http
- ${no-htx} option http-use-htx
timeout client 1s
timeout server 1s
timeout connect 1s
diff --git a/reg-tests/http-cookies/cookie_insert_indirect.vtc
b/reg-tests/http-cookies/cookie_insert_indirect.vtc
index f1afe9ecb..3c4a06ad2 100644
--- a/reg-tests/http-cookies/cookie_insert_indirect.vtc
+++ b/reg-tests/http-cookies/cookie_insert_indirect.vtc
@@ -27,7 +27,6 @@ haproxy h1 -conf {
defaults
mode http
- ${no-htx} option http-use-htx
option httplog
timeout client 1s
timeout server 1s
diff --git a/reg-tests/http-messaging/h1_to_h1.vtc
b/reg-tests/http-messaging/h1_to_h1.vtc
index c7d00858e..4a442c79d 100644
--- a/reg-tests/http-messaging/h1_to_h1.vtc
+++ b/reg-tests/http-messaging/h1_to_h1.vtc
@@ -123,7 +123,6 @@ 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/http-messaging/h2_to_h1.vtc
b/reg-tests/http-messaging/h2_to_h1.vtc
index 0d2b1e5f2..a5e565732 100644
--- a/reg-tests/http-messaging/h2_to_h1.vtc
+++ b/reg-tests/http-messaging/h2_to_h1.vtc
@@ -44,7 +44,6 @@ haproxy h1 -conf {
#log stdout format raw daemon
mode http
option http-buffer-request
- ${no-htx} option http-use-htx
timeout connect 1s
timeout client 1s
timeout server 1s
diff --git a/reg-tests/http-messaging/http_abortonclose.vtc
b/reg-tests/http-messaging/http_abortonclose.vtc
index ae0d237ae..f4497c3bf 100644
--- a/reg-tests/http-messaging/http_abortonclose.vtc
+++ b/reg-tests/http-messaging/http_abortonclose.vtc
@@ -54,7 +54,6 @@ haproxy h1 -conf {
defaults
mode http
- ${no-htx} option http-use-htx
option abortonclose
retries 3
timeout client 10s
diff --git a/reg-tests/http-messaging/http_bodyless_response.vtc
b/reg-tests/http-messaging/http_bodyless_response.vtc
index 6f36545f2..2df824b2c 100644
--- a/reg-tests/http-messaging/http_bodyless_response.vtc
+++ b/reg-tests/http-messaging/http_bodyless_response.vtc
@@ -38,7 +38,6 @@ 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/http-messaging/http_request_buffer.vtc
b/reg-tests/http-messaging/http_request_buffer.vtc
index 5542e2627..1ac04c7ac 100644
--- a/reg-tests/http-messaging/http_request_buffer.vtc
+++ b/reg-tests/http-messaging/http_request_buffer.vtc
@@ -25,7 +25,6 @@ syslog S -level info {
haproxy h1 -conf {
defaults
mode http
- ${no-htx} option http-use-htx
timeout client 100ms
timeout server 1s
timeout connect 1s
diff --git a/reg-tests/http-messaging/http_wait_for_body.vtc
b/reg-tests/http-messaging/http_wait_for_body.vtc
index 1313c9bfc..be1ca5b02 100644
--- a/reg-tests/http-messaging/http_wait_for_body.vtc
+++ b/reg-tests/http-messaging/http_wait_for_body.vtc
@@ -72,7 +72,6 @@ server s2 {
haproxy h1 -conf {
defaults
mode http
- ${no-htx} option http-use-htx
timeout client 1s
timeout server 1s
timeout connect 1s
diff --git a/reg-tests/http-messaging/protocol_upgrade.vtc
b/reg-tests/http-messaging/protocol_upgrade.vtc
index 753aafe27..7d122aa08 100644
--- a/reg-tests/http-messaging/protocol_upgrade.vtc
+++ b/reg-tests/http-messaging/protocol_upgrade.vtc
@@ -51,7 +51,6 @@ server srv_h2 {
haproxy hap -conf {
defaults
mode http
- ${no-htx} option http-use-htx
timeout connect 1s
timeout client 1s
timeout server 1s
diff --git a/reg-tests/http-messaging/websocket.vtc
b/reg-tests/http-messaging/websocket.vtc
index 576c89d68..472e5f2f7 100644
--- a/reg-tests/http-messaging/websocket.vtc
+++ b/reg-tests/http-messaging/websocket.vtc
@@ -47,7 +47,6 @@ server s2 {
haproxy hap_srv -conf {
defaults
mode http
- ${no-htx} option http-use-htx
timeout connect 1s
timeout client 1s
timeout server 1s
@@ -70,7 +69,6 @@ haproxy hap_srv -conf {
haproxy hap_srv_bad_key -conf {
defaults
mode http
- ${no-htx} option http-use-htx
timeout connect 1s
timeout client 1s
timeout server 1s
@@ -91,7 +89,6 @@ haproxy hap_srv_bad_key -conf {
haproxy hap -conf {
defaults
mode http
- ${no-htx} option http-use-htx
timeout connect 1s
timeout client 1s
timeout server 1s
diff --git a/reg-tests/http-rules/acl_cli_spaces.vtc
b/reg-tests/http-rules/acl_cli_spaces.vtc
index 55919ea40..4db79a5fa 100644
--- a/reg-tests/http-rules/acl_cli_spaces.vtc
+++ b/reg-tests/http-rules/acl_cli_spaces.vtc
@@ -12,7 +12,6 @@ server s1 {
haproxy h1 -W -S -conf {
defaults
mode http
- ${no-htx} option http-use-htx
log global
option httplog
timeout connect 1s
diff --git
a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
index 3ba47aab5..6628f367a 100644
--- a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
+++ b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
@@ -72,7 +72,6 @@ server s2 {
haproxy h1 -conf {
defaults
mode http
- ${no-htx} option http-use-htx
log global
option httplog
timeout connect 1s
@@ -128,7 +127,6 @@ haproxy h1 -conf {
haproxy h2 -conf {
defaults
mode http
- ${no-htx} option http-use-htx
log global
option httplog
timeout connect 1s
diff --git a/reg-tests/http-rules/h1or2_to_h1c.vtc
b/reg-tests/http-rules/h1or2_to_h1c.vtc
index 3fbc3f747..182013b59 100644
--- a/reg-tests/http-rules/h1or2_to_h1c.vtc
+++ b/reg-tests/http-rules/h1or2_to_h1c.vtc
@@ -38,7 +38,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/http-rules/map_redirect.vtc
b/reg-tests/http-rules/map_redirect.vtc
index 7f4526a25..f6a0eeb2d 100644
--- a/reg-tests/http-rules/map_redirect.vtc
+++ b/reg-tests/http-rules/map_redirect.vtc
@@ -35,7 +35,6 @@ server s4 {
haproxy h1 -conf {
defaults
mode http
- ${no-htx} option http-use-htx
log global
option httplog
timeout connect 1s
diff --git a/reg-tests/http-rules/map_regm_with_backref.vtc
b/reg-tests/http-rules/map_regm_with_backref.vtc
index 0e6e66e4c..7a5b879d2 100644
--- a/reg-tests/http-rules/map_regm_with_backref.vtc
+++ b/reg-tests/http-rules/map_regm_with_backref.vtc
@@ -39,7 +39,6 @@ haproxy h1 -conf {
defaults
mode http
- ${no-htx} option http-use-htx
log global
option httplog
timeout connect 1s
diff --git a/reg-tests/lua/bad_http_clt_req_duration.vtc
b/reg-tests/lua/bad_http_clt_req_duration.vtc
index 2da5e873f..4952f61ff 100644
--- a/reg-tests/lua/bad_http_clt_req_duration.vtc
+++ b/reg-tests/lua/bad_http_clt_req_duration.vtc
@@ -44,7 +44,6 @@ haproxy h1 -conf {
frontend f1
mode http
- ${no-htx} option http-use-htx
bind "fd@${f1}"
log ${Slog_addr}:${Slog_port} daemon
log-format Ta=%Ta\ Tc=%Tc\ Td=%Td\ Th=%Th\ Ti=%Ti\ Tq=%Tq\ TR=%TR\
Tr=%Tr\ Tt=%Tt\ Tw=%Tw
@@ -52,7 +51,6 @@ haproxy h1 -conf {
backend b1
mode http
- ${no-htx} option http-use-htx
http-request use-service lua.foo.http
frontend f2
diff --git a/reg-tests/lua/close_wait_lf.vtc b/reg-tests/lua/close_wait_lf.vtc
index 98492ee8e..b6772b04d 100644
--- a/reg-tests/lua/close_wait_lf.vtc
+++ b/reg-tests/lua/close_wait_lf.vtc
@@ -36,7 +36,6 @@ haproxy h1 -conf {
log ${Slog_addr}:${Slog_port} local0 debug err
log-format Ta=%Ta\ Tc=%Tc\ Td=%Td\ Th=%Th\ Ti=%Ti\ Tq=%Tq\ TR=%TR\
Tr=%Tr\ Tt=%Tt\ Tw=%Tw
mode http
- ${no-htx} option http-use-htx
bind "fd@${frt}"
http-request use-service lua.donothing
} -start
diff --git a/reg-tests/lua/h_txn_get_priv.vtc b/reg-tests/lua/h_txn_get_priv.vtc
index 658a3d665..bd8c06950 100644
--- a/reg-tests/lua/h_txn_get_priv.vtc
+++ b/reg-tests/lua/h_txn_get_priv.vtc
@@ -9,7 +9,6 @@ haproxy h1 -conf {
frontend fe1
mode http
- ${no-htx} option http-use-htx
bind "fd@${fe1}"
default_backend b1
@@ -17,7 +16,6 @@ haproxy h1 -conf {
backend b1
mode http
- ${no-htx} option http-use-htx
http-request use-service lua.fakeserv
} -start
diff --git a/reg-tests/lua/lua_socket.vtc b/reg-tests/lua/lua_socket.vtc
index 25e238e52..2e126f5c1 100644
--- a/reg-tests/lua/lua_socket.vtc
+++ b/reg-tests/lua/lua_socket.vtc
@@ -15,13 +15,11 @@ haproxy h1 -conf {
frontend fe1
mode http
- ${no-htx} option http-use-htx
bind "fd@${fe1}"
default_backend b1
backend b1
mode http
- ${no-htx} option http-use-htx
http-request use-service lua.fakeserv
} -start
diff --git a/reg-tests/lua/set_var.vtc b/reg-tests/lua/set_var.vtc
index af4cbf1eb..5ca49b6bf 100644
--- a/reg-tests/lua/set_var.vtc
+++ b/reg-tests/lua/set_var.vtc
@@ -16,14 +16,12 @@ haproxy h1 -conf {
frontend fe1
mode http
- ${no-htx} option http-use-htx
bind "fd@${fe1}"
http-request use-service lua.set_var
frontend fe2
mode http
- ${no-htx} option http-use-htx
bind "fd@${fe2}"
http-request set-header Dummy %[var(txn.fe2_foo)]
diff --git a/reg-tests/lua/txn_get_priv-thread.vtc
b/reg-tests/lua/txn_get_priv-thread.vtc
index 6f5d63269..953836342 100644
--- a/reg-tests/lua/txn_get_priv-thread.vtc
+++ b/reg-tests/lua/txn_get_priv-thread.vtc
@@ -17,20 +17,17 @@ haproxy h1 -conf {
frontend fe1
mode http
- ${no-htx} option http-use-htx
bind "fd@${fe1}"
default_backend b1
frontend fe2
mode http
- ${no-htx} option http-use-htx
bind ":8443" ssl crt ${testdir}/common.pem
stats enable
stats uri /
backend b1
mode http
- ${no-htx} option http-use-htx
http-request use-service lua.fakeserv
} -start
diff --git a/reg-tests/lua/txn_get_priv.vtc b/reg-tests/lua/txn_get_priv.vtc
index 25fb063b2..71e7bb503 100644
--- a/reg-tests/lua/txn_get_priv.vtc
+++ b/reg-tests/lua/txn_get_priv.vtc
@@ -11,20 +11,17 @@ haproxy h1 -conf {
frontend fe1
mode http
- ${no-htx} option http-use-htx
bind "fd@${fe1}"
default_backend b1
frontend fe2
mode http
- ${no-htx} option http-use-htx
bind ":8443" ssl crt ${testdir}/common.pem
stats enable
stats uri /
backend b1
mode http
- ${no-htx} option http-use-htx
http-request use-service lua.fakeserv
} -start
diff --git a/reg-tests/lua/wrong_types_usage.vtc
b/reg-tests/lua/wrong_types_usage.vtc
index 321ddf47b..ed76579ba 100644
--- a/reg-tests/lua/wrong_types_usage.vtc
+++ b/reg-tests/lua/wrong_types_usage.vtc
@@ -47,7 +47,6 @@ haproxy h1 -conf {
frontend fe1
mode http
- ${no-htx} option http-use-htx
bind "fd@${fe1}"
default_backend b1
@@ -55,7 +54,6 @@ haproxy h1 -conf {
backend b1
mode http
- ${no-htx} option http-use-htx
server s1 ${s1_addr}:${s1_port}
} -start
diff --git a/reg-tests/mcli/mcli_show_info.vtc
b/reg-tests/mcli/mcli_show_info.vtc
index dd6c6205f..e98121ce6 100644
--- a/reg-tests/mcli/mcli_show_info.vtc
+++ b/reg-tests/mcli/mcli_show_info.vtc
@@ -13,7 +13,6 @@ haproxy h1 -W -S -conf {
nbproc 4
defaults
mode http
- ${no-htx} option http-use-htx
timeout connect 1s
timeout client 1s
timeout server 1s
diff --git a/reg-tests/mcli/mcli_start_progs.vtc
b/reg-tests/mcli/mcli_start_progs.vtc
index bda9b9601..ec0219aca 100644
--- a/reg-tests/mcli/mcli_start_progs.vtc
+++ b/reg-tests/mcli/mcli_start_progs.vtc
@@ -14,7 +14,6 @@ haproxy h1 -W -S -conf {
nbproc 1
defaults
mode http
- ${no-htx} option http-use-htx
timeout connect 1s
timeout client 1s
timeout server 1s
diff --git a/reg-tests/seamless-reload/abns_socket.vtc
b/reg-tests/seamless-reload/abns_socket.vtc
index b7d6c7c48..5932a78d7 100644
--- a/reg-tests/seamless-reload/abns_socket.vtc
+++ b/reg-tests/seamless-reload/abns_socket.vtc
@@ -28,7 +28,6 @@ haproxy h1 -W -conf {
defaults
mode http
- ${no-htx} option http-use-htx
log global
option httplog
timeout connect 1s
diff --git a/reg-tests/server/cli_add_server.vtc
b/reg-tests/server/cli_add_server.vtc
index 8bb4cd2e6..670eaac1a 100644
--- a/reg-tests/server/cli_add_server.vtc
+++ b/reg-tests/server/cli_add_server.vtc
@@ -12,7 +12,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/server/cli_delete_server.vtc
b/reg-tests/server/cli_delete_server.vtc
index 3b2a57b81..7b92d7146 100644
--- a/reg-tests/server/cli_delete_server.vtc
+++ b/reg-tests/server/cli_delete_server.vtc
@@ -21,7 +21,6 @@ server s2 -repeat 3 {
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/server/cli_set_fdqn.vtc
b/reg-tests/server/cli_set_fdqn.vtc
index b3b00c3e4..8c1513391 100644
--- a/reg-tests/server/cli_set_fdqn.vtc
+++ b/reg-tests/server/cli_set_fdqn.vtc
@@ -13,7 +13,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/server/cli_set_ssl.vtc b/reg-tests/server/cli_set_ssl.vtc
index 638debea0..387c29901 100644
--- a/reg-tests/server/cli_set_ssl.vtc
+++ b/reg-tests/server/cli_set_ssl.vtc
@@ -17,7 +17,6 @@ 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/ssl/add_ssl_crt-list.vtc
b/reg-tests/ssl/add_ssl_crt-list.vtc
index f42e3af53..ca5228501 100644
--- a/reg-tests/ssl/add_ssl_crt-list.vtc
+++ b/reg-tests/ssl/add_ssl_crt-list.vtc
@@ -31,7 +31,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 1s
@@ -48,7 +47,6 @@ haproxy h1 -conf {
listen ssl-lst
mode http
- ${no-htx} option http-use-htx
bind "${tmpdir}/ssl.sock" ssl strict-sni crt-list
${testdir}/localhost.crt-list
server s1 ${s1_addr}:${s1_port}
diff --git a/reg-tests/ssl/del_ssl_crt-list.vtc
b/reg-tests/ssl/del_ssl_crt-list.vtc
index c61adc28d..4bf89f9cc 100644
--- a/reg-tests/ssl/del_ssl_crt-list.vtc
+++ b/reg-tests/ssl/del_ssl_crt-list.vtc
@@ -29,7 +29,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 100ms
@@ -47,13 +46,11 @@ haproxy h1 -conf {
listen first-ssl-fe
mode http
- ${no-htx} option http-use-htx
bind "${tmpdir}/first-ssl.sock" ssl strict-sni crt-list
${testdir}/simple.crt-list
server s1 ${s1_addr}:${s1_port}
listen second-ssl-fe
mode http
- ${no-htx} option http-use-htx
bind "${tmpdir}/second-ssl.sock" ssl crt-list
${testdir}/localhost.crt-list
server s1 ${s1_addr}:${s1_port}
} -start
diff --git a/reg-tests/ssl/new_del_ssl_cafile.vtc
b/reg-tests/ssl/new_del_ssl_cafile.vtc
index 6230a9d08..613e12866 100644
--- a/reg-tests/ssl/new_del_ssl_cafile.vtc
+++ b/reg-tests/ssl/new_del_ssl_cafile.vtc
@@ -29,7 +29,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 100ms
diff --git a/reg-tests/ssl/new_del_ssl_crlfile.vtc
b/reg-tests/ssl/new_del_ssl_crlfile.vtc
index 8f82c66fd..0d82200e7 100644
--- a/reg-tests/ssl/new_del_ssl_crlfile.vtc
+++ b/reg-tests/ssl/new_del_ssl_crlfile.vtc
@@ -29,7 +29,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 100ms
diff --git a/reg-tests/ssl/set_ssl_cafile.vtc b/reg-tests/ssl/set_ssl_cafile.vtc
index 04f892c68..eb625639b 100644
--- a/reg-tests/ssl/set_ssl_cafile.vtc
+++ b/reg-tests/ssl/set_ssl_cafile.vtc
@@ -34,7 +34,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 100ms
diff --git a/reg-tests/ssl/set_ssl_cert.vtc b/reg-tests/ssl/set_ssl_cert.vtc
index a606b477d..c4d088306 100644
--- a/reg-tests/ssl/set_ssl_cert.vtc
+++ b/reg-tests/ssl/set_ssl_cert.vtc
@@ -40,7 +40,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 100ms
diff --git a/reg-tests/ssl/set_ssl_cert_bundle.vtc
b/reg-tests/ssl/set_ssl_cert_bundle.vtc
index bbc34a400..aaec89dda 100644
--- a/reg-tests/ssl/set_ssl_cert_bundle.vtc
+++ b/reg-tests/ssl/set_ssl_cert_bundle.vtc
@@ -35,7 +35,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 100ms
diff --git a/reg-tests/ssl/set_ssl_cert_noext.vtc
b/reg-tests/ssl/set_ssl_cert_noext.vtc
index 80736bb4c..f1c42ff84 100644
--- a/reg-tests/ssl/set_ssl_cert_noext.vtc
+++ b/reg-tests/ssl/set_ssl_cert_noext.vtc
@@ -32,7 +32,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 100ms
diff --git a/reg-tests/ssl/set_ssl_crlfile.vtc
b/reg-tests/ssl/set_ssl_crlfile.vtc
index a1889d0e4..7060a1477 100644
--- a/reg-tests/ssl/set_ssl_crlfile.vtc
+++ b/reg-tests/ssl/set_ssl_crlfile.vtc
@@ -37,7 +37,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 100ms
diff --git a/reg-tests/ssl/set_ssl_server_cert.vtc
b/reg-tests/ssl/set_ssl_server_cert.vtc
index ccf78873b..0dbef7228 100644
--- a/reg-tests/ssl/set_ssl_server_cert.vtc
+++ b/reg-tests/ssl/set_ssl_server_cert.vtc
@@ -24,7 +24,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 100ms
diff --git a/reg-tests/ssl/ssl_client_auth.vtc
b/reg-tests/ssl/ssl_client_auth.vtc
index 849e8781e..f82be7b16 100644
--- a/reg-tests/ssl/ssl_client_auth.vtc
+++ b/reg-tests/ssl/ssl_client_auth.vtc
@@ -31,7 +31,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 1s
diff --git a/reg-tests/ssl/ssl_client_samples.vtc
b/reg-tests/ssl/ssl_client_samples.vtc
index ccefa7940..83662be6d 100644
--- a/reg-tests/ssl/ssl_client_samples.vtc
+++ b/reg-tests/ssl/ssl_client_samples.vtc
@@ -19,7 +19,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 1s
@@ -34,7 +33,6 @@ haproxy h1 -conf {
listen ssl-lst
mode http
- ${no-htx} option http-use-htx
http-response add-header x-ssl-der %[ssl_c_der,hex]
http-response add-header x-ssl-chain-der %[ssl_c_chain_der,hex]
diff --git a/reg-tests/ssl/ssl_crt-list_filters.vtc
b/reg-tests/ssl/ssl_crt-list_filters.vtc
index a5ba189c9..90b945238 100644
--- a/reg-tests/ssl/ssl_crt-list_filters.vtc
+++ b/reg-tests/ssl/ssl_crt-list_filters.vtc
@@ -38,7 +38,6 @@ haproxy h1 -conf {
listen ssl-lst
mode http
- ${no-htx} option http-use-htx
bind "${tmpdir}/ssl.sock" ssl strict-sni ssl-min-ver TLSv1.2
ssl-max-ver TLSv1.2 ciphers "kRSA:aECDSA" crt-list ${testdir}/filters.crt-list
server s1 ${s1_addr}:${s1_port}
diff --git a/reg-tests/ssl/ssl_frontend_samples.vtc
b/reg-tests/ssl/ssl_frontend_samples.vtc
index 5a7a0ee9b..86851cf75 100644
--- a/reg-tests/ssl/ssl_frontend_samples.vtc
+++ b/reg-tests/ssl/ssl_frontend_samples.vtc
@@ -19,7 +19,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 1s
@@ -34,7 +33,6 @@ haproxy h1 -conf {
listen ssl-lst
mode http
- ${no-htx} option http-use-htx
http-response add-header x-ssl-der %[ssl_f_der,hex]
http-response add-header x-ssl-sha1 %[ssl_f_sha1,hex]
diff --git a/reg-tests/ssl/ssl_server_samples.vtc
b/reg-tests/ssl/ssl_server_samples.vtc
index 53dd1b81c..136ccafa4 100644
--- a/reg-tests/ssl/ssl_server_samples.vtc
+++ b/reg-tests/ssl/ssl_server_samples.vtc
@@ -20,7 +20,6 @@ haproxy h1 -conf {
defaults
mode http
option httplog
- ${no-htx} option http-use-htx
log stderr local0 debug err
option logasap
timeout connect 1s
@@ -47,7 +46,6 @@ haproxy h1 -conf {
listen ssl-lst
mode http
- ${no-htx} option http-use-htx
bind "${tmpdir}/ssl.sock" ssl strict-sni crt-list
${testdir}/localhost.crt-list
diff --git a/reg-tests/ssl/ssl_simple_crt-list.vtc
b/reg-tests/ssl/ssl_simple_crt-list.vtc
index d3353a129..d35c27d67 100644
--- a/reg-tests/ssl/ssl_simple_crt-list.vtc
+++ b/reg-tests/ssl/ssl_simple_crt-list.vtc
@@ -37,7 +37,6 @@ haproxy h1 -conf {
listen ssl-lst
mode http
- ${no-htx} option http-use-htx
bind "${tmpdir}/ssl.sock" ssl strict-sni crt-list
${testdir}/simple.crt-list
server s1 ${s1_addr}:${s1_port}
diff --git a/reg-tests/ssl/wrong_ctx_storage.vtc
b/reg-tests/ssl/wrong_ctx_storage.vtc
index 9f0bdd789..7dc7528a5 100644
--- a/reg-tests/ssl/wrong_ctx_storage.vtc
+++ b/reg-tests/ssl/wrong_ctx_storage.vtc
@@ -29,7 +29,6 @@ haproxy h1 -conf {
listen frt
mode http
- ${no-htx} option http-use-htx
bind "fd@${frt}" ssl crt ${testdir}/common.pem
http-request redirect location /
} -start
diff --git a/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
b/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
index 502a05996..2e859bdb5 100644
--- a/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
+++ b/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
@@ -30,7 +30,6 @@ haproxy h1 -conf {
# Configuration file of 'h1' haproxy instance.
defaults
mode http
- ${no-htx} option http-use-htx
timeout connect 5s
timeout server 30s
timeout client 30s
diff --git a/reg-tests/stick-table/src_conn_rate.vtc
b/reg-tests/stick-table/src_conn_rate.vtc
index 7078213ad..8281ca935 100644
--- a/reg-tests/stick-table/src_conn_rate.vtc
+++ b/reg-tests/stick-table/src_conn_rate.vtc
@@ -9,7 +9,6 @@ haproxy h0 -conf {
timeout server 5s
listen li
- ${no-htx} option http-use-htx
bind "fd@${fe1}"
http-request track-sc0 src table conn_rate_table
http-request deny if { src_conn_rate(conn_rate_table)
gt 3 }
diff --git a/reg-tests/stick-table/unknown_key.vtc
b/reg-tests/stick-table/unknown_key.vtc
index ca84c0bef..980443c01 100644
--- a/reg-tests/stick-table/unknown_key.vtc
+++ b/reg-tests/stick-table/unknown_key.vtc
@@ -18,7 +18,6 @@ haproxy h0 -conf {
frontend test
mode http
- ${no-htx} option http-use-htx
bind "fd@${fe1}"
stick-table type ip size 1m expire 1h store gpc0
http-request deny if { src,table_trackers(test) eq 1 }
diff --git a/reg-tests/stickiness/lb-services.vtc
b/reg-tests/stickiness/lb-services.vtc
index e88656468..28b08b534 100644
--- a/reg-tests/stickiness/lb-services.vtc
+++ b/reg-tests/stickiness/lb-services.vtc
@@ -46,7 +46,6 @@ server s4 {
haproxy h1 -arg "-L A" -conf {
defaults
mode http
- ${no-htx} option http-use-htx
timeout server 1s
timeout connect 1s
timeout client 1s
@@ -110,7 +109,6 @@ server s8 {
haproxy h2 -arg "-L B" -conf {
defaults
mode http
- ${no-htx} option http-use-htx
timeout server 1s
timeout connect 1s
timeout client 1s
diff --git a/reg-tests/stickiness/srvkey-addr.vtc
b/reg-tests/stickiness/srvkey-addr.vtc
index 05616387a..5001063b7 100644
--- a/reg-tests/stickiness/srvkey-addr.vtc
+++ b/reg-tests/stickiness/srvkey-addr.vtc
@@ -35,7 +35,6 @@ server s2 {
haproxy h1 -arg "-L A" -conf {
defaults
mode http
- ${no-htx} option http-use-htx
timeout server 1s
timeout connect 1s
timeout client 1s
@@ -77,7 +76,6 @@ haproxy h1 -arg "-L A" -conf {
haproxy h2 -arg "-L B" -conf {
defaults
mode http
- ${no-htx} option http-use-htx
timeout server 1s
timeout connect 1s
timeout client 1s
diff --git a/reg-tests/webstats/webstats-scope-and-post-change.vtc
b/reg-tests/webstats/webstats-scope-and-post-change.vtc
index fe8b33333..b26356fef 100644
--- a/reg-tests/webstats/webstats-scope-and-post-change.vtc
+++ b/reg-tests/webstats/webstats-scope-and-post-change.vtc
@@ -17,7 +17,6 @@ haproxy h1 -conf {
defaults
mode http
- ${no-htx} option http-use-htx
frontend fe1
bind "fd@${fe1}"
diff --git a/scripts/run-regtests.sh b/scripts/run-regtests.sh
index 37668c9e1..b542f24f8 100755
--- a/scripts/run-regtests.sh
+++ b/scripts/run-regtests.sh
@@ -38,15 +38,6 @@ _help()
--clean to cleanup previous reg-tests log directories and exit
run-regtests.sh --clean
- --use-htx to use the HTX in tests (deprecated, the default mode now)
-
- --no-htx to use the legacy HTTP in tests
- run-regtests.sh --no-htx, sets the macro \${no-htx}
- In .vtc files, in HAProxy configuration, you should use the following
line
- to "templatize" your tests:
-
- \${no-htx} option http-use-htx
-
Including text below into a .vtc file will check for its requirements
related to haproxy's target and compilation options
# Below targets are not capable of completing this test successfully
@@ -283,12 +274,6 @@ _process() {
REGTESTS_TYPES="$2"
shift
;;
- --use-htx)
- no_htx=""
- ;;
- --no-htx)
- no_htx="no "
- ;;
--clean)
_cleanup
exit 0
@@ -323,7 +308,6 @@ jobcount=""
verbose="-q"
debug=""
keep_logs="-l"
-no_htx=""
testlist=""
_process "$@";
@@ -367,10 +351,6 @@ echo "Options : $FEATURES"
echo "Services : $SERVICES"
echo "########################## Gathering tests to run
##########################"
-# if htx is enable, but HAProxy version is lower to 1.9, disable it
-if [ $(_version "$HAPROXY_VERSION") -lt $(_version "1.9") ]; then
- no_htx="#"
-fi
if [ -z "$REGTESTS" ]; then
_findtests reg-tests/
@@ -387,7 +367,7 @@ if [ -n "$testlist" ]; then
if [ -n "$jobcount" ]; then
jobcount="-j $jobcount"
fi
- cmd="$VTEST_PROGRAM -b $((2<<20)) -k -t 10 -Dno-htx=${no_htx} $keep_logs
$verbose $debug $jobcount $vtestparams $testlist"
+ cmd="$VTEST_PROGRAM -b $((2<<20)) -k -t 10 $keep_logs $verbose $debug
$jobcount $vtestparams $testlist"
eval $cmd
_vtresult=$?
else
--
2.31.1
