amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 12:37:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

精简代码

Browse Source
This commit is contained in:
xiongziliang 2019-11-30 11:56:40 +08:00
parent 12346f77a4
commit d46b67a5cf
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Http/HttpFileManager.cpp
View File

@ -350,7 +350,7 @@ static void accessFile(TcpSession &sender, const Parser &parser, const MediaInfo
if (cookie) { if (cookie) {
headerOut["Set-Cookie"] = cookie->getCookie((*cookie)[kCookiePathKey].get<string>()); headerOut["Set-Cookie"] = cookie->getCookie((*cookie)[kCookiePathKey].get<string>());
} }
cb("401 Unauthorized", "", headerOut, std::make_shared<HttpStringBody>(errMsg)); cb("401 Unauthorized", "text/html", headerOut, std::make_shared<HttpStringBody>(errMsg));
return; return;
} }
@ -380,7 +380,7 @@ void HttpFileManager::onAccessPath(TcpSession &sender, Parser &parser, const Htt
auto strFile = File::absolutePath(enableVhost ? mediaInfo._vhost + parser.Url() : parser.Url(), rootPath); auto strFile = File::absolutePath(enableVhost ? mediaInfo._vhost + parser.Url() : parser.Url(), rootPath);
//访问的是文件夹 //访问的是文件夹
if (strFile.back() == '/' || File::is_dir(strFile.data())) { if (File::is_dir(strFile.data())) {
auto indexFile = searchIndexFile(strFile); auto indexFile = searchIndexFile(strFile);
if (!indexFile.empty()) { if (!indexFile.empty()) {
//发现该文件夹下有index文件 //发现该文件夹下有index文件

4
src/Http/HttpSession.cpp
View File

@ -299,9 +299,7 @@ void HttpSession::Handle_Req_GET(int64_t &content_len) {
if (!strongSelf) { if (!strongSelf) {
return; return;
} }
strongSelf->sendResponse(status_code.data(), bClose, strongSelf->sendResponse(status_code.data(), bClose, content_type.data(), responseHeader, body);
content_type.empty() ? nullptr : content_type.data(),
responseHeader, body);
}); });
}); });
} }