Browse Source

fix: [apache] support of new rust implementation of ``shyaml``

pull/37/head
Valentin Lab 10 months ago
parent
commit
93d0d9167c
  1. 4
      apache/lib/common

4
apache/lib/common

@ -159,7 +159,7 @@ _get_ssl_option_value() {
fi fi
if ssl_cfg=$(e "$cfg" | cfg-get-value ssl 2>/dev/null); then if ssl_cfg=$(e "$cfg" | cfg-get-value ssl 2>/dev/null); then
if [[ "$ssl_cfg" =~ ^False|None$ ]]; then
if [[ "$ssl_cfg" =~ ^False|None|false|null$ ]]; then
ssl_cfg="" ssl_cfg=""
fi fi
echo "$ssl_cfg" | tee "$cache_file" echo "$ssl_cfg" | tee "$cache_file"
@ -249,7 +249,7 @@ ssl_get_plugin_fun() {
} }
type="$(echo "$cfg" | shyaml -y get-type 2>/dev/null)" || return 1 type="$(echo "$cfg" | shyaml -y get-type 2>/dev/null)" || return 1
if [[ "$type" == "bool" ]]; then
if [[ "$type" == "bool" ]] || [[ "$type" == "str" && "$cfg" =~ ^false|true$ ]]; then
printf "%s\0" "ssl_fallback" "" "$cfg" | tee "$cache_file" printf "%s\0" "ssl_fallback" "" "$cfg" | tee "$cache_file"
return 0 return 0
fi fi

Loading…
Cancel
Save