ouyang/dnsmgr
1
1
Fork 0
mirror of https://github.com/netcccyun/dnsmgr.git synced 2026-07-04 23:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 移除废弃的 curl_close() 调用，兼容 PHP 8.5 (#498)

Browse Source 
- 删除 18 个文件中共 32 处 curl_close() 调用（PHP 8.0+ 已为无操作）

- 修复 ACMEv2.php 中 $code 可能为 null 的潜在问题

- 调整 public/.htaccess 伪静态规则，兼容 Windows + CGI 模式
This commit is contained in:
wmwlwmwl
2026-06-28 18:13:20 +08:00
committed by GitHub
parent 1d26b6c830
commit ff8cb42e2d
19 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/acme/ACMEv2.php
+2 -3
View File
@@ -29,7 +29,6 @@ class ACMEv2
public function __destruct()
{
if (PHP_MAJOR_VERSION < 8 && $this->account_key) openssl_pkey_free($this->account_key);
if ($this->ch) curl_close($this->ch);
}
public function loadAccountKey($account_key_pem)
@@ -377,7 +376,7 @@ class ACMEv2
if (!empty($headers['content-type'])) {
switch ($headers['content-type']) {
case 'application/json':
if ($code[0] == '2') { // on non 2xx response: fall through to problem+json case
if (!is_null($code) && $code[0] == '2') { // on non 2xx response: fall through to problem+json case
$body = $this->json_decode($body);
if (isset($body['error']) && !(isset($body['status']) && $body['status'] === 'valid')) {
$this->handleError($body['error']);
@@ -391,7 +390,7 @@ class ACMEv2
}
}
if ($code[0] != '2') {
if (!is_null($code) && $code[0] != '2') {
throw new Exception('Invalid HTTP-Status-Code received: ' . $code . ': ' . print_r($body, true));
}
app/lib/client/AWS.php
-2
View File
@@ -286,7 +286,6 @@ class AWS
$errno = curl_errno($ch);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
@@ -297,7 +296,6 @@ class AWS
$headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
$response = substr($response, $headerSize);
}
curl_close($ch);
if ($httpCode >= 200 && $httpCode < 300) {
if (empty($response)) return true;
app/lib/client/Aliyun.php
-2
View File
@@ -63,10 +63,8 @@ class Aliyun
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
curl_close($ch);
$arr = json_decode($response, true);
if ($httpCode == 200) {
app/lib/client/AliyunNew.php
-2
View File
@@ -169,11 +169,9 @@ class AliyunNew
$errno = curl_errno($ch);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
$arr = json_decode($response, true);
if ($httpCode == 200) {
app/lib/client/AliyunOSS.php
-2
View File
@@ -120,10 +120,8 @@ class AliyunOSS
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
curl_close($ch);
if ($httpCode >= 200 && $httpCode < 300) {
if (empty($response)) return true;
app/lib/client/BaiduCloud.php
-2
View File
@@ -159,10 +159,8 @@ class BaiduCloud
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
curl_close($ch);
if (empty($response) && $httpCode == 200) {
return true;
app/lib/client/Ctyun.php
-2
View File
@@ -150,10 +150,8 @@ class Ctyun
$errno = curl_errno($ch);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
curl_close($ch);
$arr = json_decode($response, true);
if (isset($arr['statusCode']) && ($arr['statusCode'] == 100000 || $arr['statusCode'] == 0 && $this->endpoint == 'cf-global.ctapi.ctyun.cn')) {
app/lib/client/HuaweiCloud.php
-2
View File
@@ -164,11 +164,9 @@ class HuaweiCloud
$errno = curl_errno($ch);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
$arr = json_decode($response, true);
if ($arr) {
app/lib/client/HuaweiOBS.php
-2
View File
@@ -107,10 +107,8 @@ class HuaweiOBS
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
curl_close($ch);
if ($httpCode >= 200 && $httpCode < 300) {
if (empty($response)) return true;
app/lib/client/Jdcloud.php
-2
View File
@@ -168,11 +168,9 @@ class Jdcloud
$errno = curl_errno($ch);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
$arr = json_decode($response, true);
if ($httpCode == 200) {
app/lib/client/Ksyun.php
-2
View File
@@ -189,11 +189,9 @@ class Ksyun
$errno = curl_errno($ch);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
$arr = json_decode($response, true);
if ($httpCode == 200) {
app/lib/client/Qiniu.php
-2
View File
@@ -122,10 +122,8 @@ class Qiniu
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
curl_close($ch);
if ($httpCode == 200) {
$arr = json_decode($response, true);
app/lib/client/TencentCloud.php
-2
View File
@@ -114,10 +114,8 @@ class TencentCloud
$errno = curl_errno($ch);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
curl_close($ch);
$arr = json_decode($response, true);
if ($arr) {
app/lib/client/Volcengine.php
-2
View File
@@ -219,11 +219,9 @@ class Volcengine
$errno = curl_errno($ch);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
$arr = json_decode($response, true);
if ($httpCode == 200) {
app/lib/deploy/k8s.php
-1
View File
@@ -175,7 +175,6 @@ class k8s implements DeployInterface
$resp = curl_exec($ch);
$code = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
$err = curl_error($ch);
curl_close($ch);
return [$code, $resp, $err];
}
app/lib/deploy/s3storage.php
-2
View File
@@ -105,11 +105,9 @@ class s3storage implements DeployInterface
$errno = curl_errno($ch);
if ($errno) {
$errmsg = curl_error($ch);
curl_close($ch);
throw new Exception('Curl error: ' . $errmsg);
}
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
if ($httpCode >= 200 && $httpCode < 300) {
return $response;
app/lib/mail/Sendcloud.php
-1
View File
@@ -31,7 +31,6 @@ class Sendcloud
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
$json = curl_exec($ch);
curl_close($ch);
$arr = json_decode($json, true);
if ($arr['statusCode'] == 200) {
return true;
app/utils/MsgNotice.php
-1
View File
@@ -468,7 +468,6 @@ class MsgNotice
curl_setopt($ch, CURLOPT_ENCODING, "gzip");
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
$ret = curl_exec($ch);
curl_close($ch);
return $ret;
}
}
public/.htaccess
+3 -1
View File
@@ -1,9 +1,11 @@
<IfModule mod_rewrite.c>
Options +FollowSymlinks -Multiviews
RewriteEngine On
RewriteBase /
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^(.*)$ index.php/$1 [QSA,PT,L]
RewriteRule ^(.*)$ index.php [L,QSA,E=PATH_INFO:/$1]
SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
</IfModule>