From e58d8f4af1b45611670ba5a4745fe8a71e8c10bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fantaj=C4=AB=20=C3=97=20Neko?= Date: Thu, 29 May 2025 15:10:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BB=A3=E7=90=86=E8=AE=BE=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8F=8D=E4=BB=A3=E6=97=B6=E4=B8=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/lib/acme/ACMEv2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/acme/ACMEv2.php b/app/lib/acme/ACMEv2.php index b01d171..0bfbe8c 100644 --- a/app/lib/acme/ACMEv2.php +++ b/app/lib/acme/ACMEv2.php @@ -321,7 +321,7 @@ class ACMEv2 } )); - if ($this->proxy) { + if ($this->proxy == 1) { curl_set_proxy($this->ch); } From e328dc6808a6ab3f4d5b9e752d40a78fabb0f007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fantaj=C4=AB=20=C3=97=20Neko?= Date: Thu, 29 May 2025 16:43:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9ESOCK5H=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E8=BF=9C=E7=A8=8B=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E5=90=8D=E9=81=BF=E5=85=8DDNS=E6=B1=A1?= =?UTF-8?q?=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common.php | 4 ++++ app/utils/CheckUtils.php | 2 ++ app/view/system/proxyset.html | 1 + 3 files changed, 7 insertions(+) diff --git a/app/common.php b/app/common.php index bf6bd2d..5582abe 100644 --- a/app/common.php +++ b/app/common.php @@ -326,6 +326,8 @@ function check_proxy($url, $proxy_server, $proxy_port, $type, $proxy_user, $prox $proxy_type = CURLPROXY_SOCKS4; } elseif ($type == 'sock5') { $proxy_type = CURLPROXY_SOCKS5; + } elseif ($type == 'sock5h') { + $proxy_type = CURLPROXY_SOCKS5_HOSTNAME; } else { $proxy_type = CURLPROXY_HTTP; } @@ -462,6 +464,8 @@ function curl_set_proxy(&$ch) $proxy_type = CURLPROXY_SOCKS4; } elseif ($proxy_type == 'sock5') { $proxy_type = CURLPROXY_SOCKS5; + } elseif ($proxy_type == 'sock5h') { + $proxy_type = CURLPROXY_SOCKS5_HOSTNAME; } else { $proxy_type = CURLPROXY_HTTP; } diff --git a/app/utils/CheckUtils.php b/app/utils/CheckUtils.php index e99ffcb..3418aee 100644 --- a/app/utils/CheckUtils.php +++ b/app/utils/CheckUtils.php @@ -30,6 +30,8 @@ class CheckUtils $proxy_type = CURLPROXY_SOCKS4; } elseif ($proxy_type == 'sock5') { $proxy_type = CURLPROXY_SOCKS5; + } elseif ($proxy_type == 'sock5h') { + $proxy_type = CURLPROXY_SOCKS5_HOSTNAME; } else { $proxy_type = CURLPROXY_HTTP; } diff --git a/app/view/system/proxyset.html b/app/view/system/proxyset.html index 6e363fd..c77de24 100644 --- a/app/view/system/proxyset.html +++ b/app/view/system/proxyset.html @@ -30,6 +30,7 @@ +