diff options
| author | Stan Grishin <stangri@melmac.ca> | 2023-05-19 15:54:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-19 15:54:03 -0600 |
| commit | 2a88a72da4a8f5179a60d9115e07d674878d707a (patch) | |
| tree | 4ae754708a37f22b07e5d4859568aae8a684abf6 /applications/luci-app-https-dns-proxy | |
| parent | 6e1096da6831b40f11f4f448ba34f0bf94239797 (diff) | |
| parent | 5553a66903a1889b52aeb2d36e3d9de455e45c2e (diff) | |
Merge pull request #6392 from stangri/master-luci-app-https-dns-proxy
luci-app-https-dns-proxy: fix curl-related error in logs
Diffstat (limited to 'applications/luci-app-https-dns-proxy')
3 files changed, 2 insertions, 16 deletions
diff --git a/applications/luci-app-https-dns-proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile index e2e0a49c9d..6661542eae 100644 --- a/applications/luci-app-https-dns-proxy/Makefile +++ b/applications/luci-app-https-dns-proxy/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> -PKG_VERSION:=2022-10-15-11 +PKG_VERSION:=2022-10-15-14 LUCI_TITLE:=DNS Over HTTPS Proxy Web UI LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy diff --git a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua index 8396f46698..8fa613a3d5 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua +++ b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua @@ -103,7 +103,7 @@ else end end -if sys.call("curl --version | grep -q HTTP2") == 0 then +if sys.call("grep -q 'Provides: libnghttp2' /usr/lib/opkg/status") == 0 then http2Supported = true end diff --git a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot index 13ad80e724..62da3aa641 100644 --- a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot +++ b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot @@ -14,16 +14,10 @@ msgid "360 Secure DNS - CN" msgstr "" #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3 -#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns-family.lua:3 msgid "AdGuard (Family Protection)" msgstr "" -#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns-nonfiltering.lua:3 -msgid "AdGuard (Non-filtering)" -msgstr "" - #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3 -#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns.lua:3 msgid "AdGuard (Standard)" msgstr "" @@ -171,17 +165,14 @@ msgstr "" msgid "Configuration" msgstr "" -#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads-social.lua:3 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p3.lua:3 msgid "ControlD (Block Malware + Ads + Social)" msgstr "" -#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads.lua:3 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p2.lua:3 msgid "ControlD (Block Malware + Ads)" msgstr "" -#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware.lua:3 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p1.lua:3 msgid "ControlD (Block Malware)" msgstr "" @@ -191,7 +182,6 @@ msgid "ControlD (Family)" msgstr "" #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p0.lua:3 -#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.unfiltered.lua:3 msgid "ControlD (Unfiltered)" msgstr "" @@ -460,10 +450,6 @@ msgstr "" msgid "Tiarap Public DNS - SG" msgstr "" -#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.edu.tsinghua.tuna.dns.lua:3 -msgid "Tsinghua University Secure DNS - CN" -msgstr "" - #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:65 msgid "Unknown Provider" msgstr "" |