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

http服务器支持查找index.html文件

Browse Source
This commit is contained in:
xiongziliang 2019-05-16 17:31:48 +08:00
parent 4c39821691
commit 28d20955e0
1 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Http/HttpSession.cpp
View File

@ -266,6 +266,25 @@ inline bool HttpSession::checkLiveFlvStream(){
inline bool makeMeun(const string &httpPath,const string &strFullPath,const string &vhost, string &strRet) ; inline bool makeMeun(const string &httpPath,const string &strFullPath,const string &vhost, string &strRet) ;
inline static string findIndexFile(const string &dir){
DIR *pDir;
dirent *pDirent;
if ((pDir = opendir(dir.data())) == NULL) {
return "";
}
set<string> setFile;
while ((pDirent = readdir(pDir)) != NULL) {
static set<const char *,StrCaseCompare> indexSet = {"index.html","index.htm","index"};
if(indexSet.find(pDirent->d_name) != indexSet.end()){
closedir(pDir);
return pDirent->d_name;
}
}
closedir(pDir);
return "";
}
inline bool HttpSession::Handle_Req_GET(int64_t &content_len) { inline bool HttpSession::Handle_Req_GET(int64_t &content_len) {
//先看看是否为WebSocket请求 //先看看是否为WebSocket请求
if(checkWebSocket()){ if(checkWebSocket()){
@ -299,10 +318,18 @@ inline bool HttpSession::Handle_Req_GET(int64_t &content_len) {
GET_CONFIG_AND_REGISTER(string,rootPath,Http::kRootPath); GET_CONFIG_AND_REGISTER(string,rootPath,Http::kRootPath);
string strFile = enableVhost ? rootPath + "/" + _mediaInfo._vhost + _parser.Url() :rootPath + _parser.Url(); string strFile = enableVhost ? rootPath + "/" + _mediaInfo._vhost + _parser.Url() :rootPath + _parser.Url();
replace(strFile,"//","/"); replace(strFile,"//","/");
bool bClose = (strcasecmp(_parser["Connection"].data(),"close") == 0) || ( ++_iReqCnt > reqCnt); bool bClose = (strcasecmp(_parser["Connection"].data(),"close") == 0) || ( ++_iReqCnt > reqCnt);
do{
//访问的是文件夹 //访问的是文件夹
if (strFile.back() == '/' || File::is_dir(strFile.data())) { if (strFile.back() == '/' || File::is_dir(strFile.data())) {
auto indexFile = findIndexFile(strFile);
if(!indexFile.empty()){
//发现该文件夹下有index文件
strFile = strFile + "/" + indexFile;
replace(strFile,"//","/");
break;
}
//生成文件夹菜单索引 //生成文件夹菜单索引
string strMeun; string strMeun;
if (!makeMeun(_parser.Url(),strFile,_mediaInfo._vhost, strMeun)) { if (!makeMeun(_parser.Url(),strFile,_mediaInfo._vhost, strMeun)) {
@ -313,6 +340,8 @@ inline bool HttpSession::Handle_Req_GET(int64_t &content_len) {
sendResponse("200 OK", makeHttpHeader(bClose,strMeun.size() ), strMeun); sendResponse("200 OK", makeHttpHeader(bClose,strMeun.size() ), strMeun);
return !bClose; return !bClose;
} }
}while(0);
//访问的是文件 //访问的是文件
struct stat tFileStat; struct stat tFileStat;
if (0 != stat(strFile.data(), &tFileStat)) { if (0 != stat(strFile.data(), &tFileStat)) {