luci: fix no-check-certificate config not working issue

This commit is contained in:
Nick Peng
2020-08-02 17:43:38 +08:00
parent 297ea29639
commit 138df2fd5d
3 changed files with 3 additions and 8 deletions

View File

@@ -156,7 +156,7 @@ load_server()
config_get type "$section" "type" "udp" config_get type "$section" "type" "udp"
config_get ip "$section" "ip" "" config_get ip "$section" "ip" ""
config_get tls_host_verify "$section" "tls_host_verify" "" config_get tls_host_verify "$section" "tls_host_verify" ""
config_get no_check_certificate "$section" "no_check_certificate" "" config_get no_check_certificate "$section" "no_check_certificate" "0"
config_get host_name "$section" "host_name" "" config_get host_name "$section" "host_name" ""
config_get http_host "$section" "http_host" "" config_get http_host "$section" "http_host" ""
config_get server_group "$section" "server_group" "" config_get server_group "$section" "server_group" ""
@@ -187,7 +187,7 @@ load_server()
fi fi
[ -z "$tls_host_verify" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -tls-host-verify $tls_host_verify" [ -z "$tls_host_verify" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -tls-host-verify $tls_host_verify"
[ -z "$no_check_certificate" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -no-check-certificate" [ "$no_check_certificate" = "0" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -no-check-certificate"
[ -z "$host_name" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -host-name $host_name" [ -z "$host_name" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -host-name $host_name"
[ -z "$http_host" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -http-host $http_host" [ -z "$http_host" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -http-host $http_host"
[ -z "$server_group" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -group $server_group" [ -z "$server_group" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -group $server_group"

View File

@@ -19,6 +19,7 @@
#include "http_parse.h" #include "http_parse.h"
#include "hash.h" #include "hash.h"
#include "hashtable.h" #include "hashtable.h"
#include "util.h"
#include "jhash.h" #include "jhash.h"
#include "list.h" #include "list.h"
#include <stdlib.h> #include <stdlib.h>

View File

@@ -20,12 +20,6 @@
#ifndef _GENERIC_ATOMIC_H #ifndef _GENERIC_ATOMIC_H
#define _GENERIC_ATOMIC_H #define _GENERIC_ATOMIC_H
/* Check GCC version, just to be safe */
#if !defined(__GNUC__) || (__GNUC__ < 4) || (__GNUC_MINOR__ < 1)
# error atomic.h works only with GCC newer than version 4.1
#endif /* GNUC >= 4.1 */
/** /**
* Atomic type. * Atomic type.
*/ */