ouyang/dnsmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #274 from HanadaLee/multipartpostfix

Browse Source 
重构POST内容判断逻辑，去除X-Content-Type标头
This commit is contained in:
Hanada
2025-07-12 09:44:14 +08:00
committed by GitHub
parent c31e0eaf41
commit 0837ac9be1
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/common.php
View File

@@ -450,25 +450,23 @@ function http_request($url, $data = null, $referer = null, $cookie = null, $head
}
}
} else if (is_array($data) || is_object($data)) {
if (isset($options['headers']['X-Content-Type']) && $options['headers']['X-Content-Type'] == 'multipart/form-data') {
if (!isset($options['headers']['Content-Type'])) {
// 默认为表单
$options['headers']['Content-Type'] = 'application/x-www-form-urlencoded';
}
if ($options['headers']['Content-Type'] == 'application/x-www-form-urlencoded') {
// 表单
$options['form_params'] = $data;
} else if ($options['headers']['Content-Type'] == 'multipart/form-data') {
// 表单文件
unset($options['headers']['X-Content-Type']);
$options['multipart'] = $data;
unset($options['headers']['Content-Type']); // 由GuzzleHttp重新生成Content-Type头部
} else if ($options['headers']['Content-Type'] == 'application/json') {
// json
$options['json'] = $data;
} else {
if (!isset($options['headers']['Content-Type'])) {
// 默认为表单
$options['headers']['Content-Type'] = 'application/x-www-form-urlencoded';
}
if ($options['headers']['Content-Type'] == 'application/x-www-form-urlencoded') {
// 表单
$options['form_params'] = $data;
} else if ($options['headers']['Content-Type'] == 'application/json') {
// json
$options['json'] = $data;
} else {
// 其他
$options['body'] = http_build_query($data);
}
// 其他
$options['body'] = http_build_query($data);
}
} else {
$options['body'] = $data;

2
app/lib/deploy/synology.php
View File

@@ -110,7 +110,7 @@ class synology implements DeployInterface
'SynoToken' => $this->token['synotoken'],
];
$headers = [
'X-Content-Type' => 'multipart/form-data'
'Content-Type' => 'multipart/form-data'
];
$post = [
[