Undoing https://github.com/emqx/emqx/pull/10160
@@ -3,7 +3,7 @@
{id, "emqx"},
{description, "EMQX Core"},
% strict semver, bump manually!
- {vsn, "5.0.23"},
+ {vsn, "5.0.24"},
{modules, []},
{registered, []},
{applications, [
@@ -2322,8 +2322,6 @@ server_ssl_opts_schema(Defaults, IsRanchListener) ->
ref("ocsp"),
#{
required => false,
- %% TODO: remove after e5.0.2
- importance => ?IMPORTANCE_HIDDEN,
validator => fun ocsp_inner_validator/1
}
)},
@@ -2332,6 +2330,7 @@ server_ssl_opts_schema(Defaults, IsRanchListener) ->
boolean(),
default => false,
+ importance => ?IMPORTANCE_MEDIUM,
desc => ?DESC("server_ssl_opts_schema_enable_crl_check")
)}
@@ -677,8 +677,12 @@ do_t_update_listener(Config) ->
%% no ocsp at first
ListenerId = "ssl:default",
{ok, {{_, 200, _}, _, ListenerData0}} = get_listener_via_api(ListenerId),
- ?assertEqual(
- undefined,
+ ?assertMatch(
+ #{
+ <<"enable_ocsp_stapling">> := false,
+ <<"refresh_http_timeout">> := _,
+ <<"refresh_interval">> := _
+ },
emqx_utils_maps:deep_get([<<"ssl_options">>, <<"ocsp">>], ListenerData0, undefined)
),
assert_no_http_get(),