taixingyiji/subconverter
1
0 Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2026-11-02 01:33:04 +00:00
Code Issues Projects Releases Wiki Activity

Enhancements

Browse Source 
Fix incorrect order of tolerance and timeout field in custom group config.
Fix Content-Disposition header for better support on browsers.
Fix parsing of some Shadowrocket links.
Support HEAD request that only return Subscription-UserInfo (#434).
Add more detail info to crash report.
This commit is contained in:
Tindy X committed 2022-03-20 17:34:01 +08:00
1 parent ebe68f64b1
commit 406b0f2022
6 files changed
+56 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/handler/interfaces.cpp
+8 -5
View File
@@ -342,7 +342,7 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
std::string argGroupName = urlDecode(getUrlArg(argument, "group")), argUploadPath = getUrlArg(argument, "upload_path");
std::string argIncludeRemark = urlDecode(getUrlArg(argument, "include")), argExcludeRemark = urlDecode(getUrlArg(argument, "exclude"));
std::string argCustomGroups = urlSafeBase64Decode(getUrlArg(argument, "groups")), argCustomRulesets = urlSafeBase64Decode(getUrlArg(argument, "ruleset")), argExternalConfig = urlDecode(getUrlArg(argument, "config"));
std::string argDeviceID = getUrlArg(argument, "dev_id"), argFilename = getUrlArg(argument, "filename"), argUpdateInterval = getUrlArg(argument, "interval"), argUpdateStrict = getUrlArg(argument, "strict");
std::string argDeviceID = getUrlArg(argument, "dev_id"), argFilename = urlDecode(getUrlArg(argument, "filename")), argUpdateInterval = getUrlArg(argument, "interval"), argUpdateStrict = getUrlArg(argument, "strict");
std::string argRenames = urlDecode(getUrlArg(argument, "rename")), argFilterScript = urlDecode(getUrlArg(argument, "filter_script"));
/// switches with default value
@@ -612,6 +612,12 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
*status_code = 400;
return "No nodes were found!";
}
if(subInfo.size() && argAppendUserinfo.get(global.appendUserinfo))
response.headers.emplace("Subscription-UserInfo", subInfo);
if(request.method == "HEAD")
return "";
argPrependInsert.define(global.prependInsert);
if(argPrependInsert)
{
@@ -673,9 +679,6 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
for(Proxy &x : nodes)
x.Group = argGroupName;
if(subInfo.size() && argAppendUserinfo.get(global.appendUserinfo))
response.headers.emplace("Subscription-UserInfo", subInfo);
//do pre-process now
preprocessNodes(nodes, ext);
@@ -886,7 +889,7 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
}
writeLog(0, "Generate completed.", LOG_LEVEL_INFO);
if(argFilename.size())
response.headers.emplace("Content-Disposition", "attachment; filename=\"" + argFilename + "\"");
response.headers.emplace("Content-Disposition", "attachment; filename=\"" + argFilename + "\"; filename*=utf-8''" + urlEncode(argFilename));
return output_content;
}