THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复http头重复的bug

This commit is contained in:
xiongziliang 2019-07-17 14:54:14 +08:00
parent 917763c435
commit ff34b937f3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Http/HttpSession.cpp
View File

@ -913,16 +913,17 @@ void HttpSession::responseDelay(const string &Origin,bool bClose,
sendNotFound(bClose); sendNotFound(bClose);
return; return;
} }
auto headerOther = makeHttpHeader(bClose,contentOut.size(),"text/plain"); auto headerOther=makeHttpHeader(bClose,contentOut.size(),"text/plain");
if(!Origin.empty()){ if(!Origin.empty()){
headerOther["Access-Control-Allow-Origin"] = Origin; headerOther["Access-Control-Allow-Origin"] = Origin;
headerOther["Access-Control-Allow-Credentials"] = "true"; headerOther["Access-Control-Allow-Credentials"] = "true";
} }
for (auto &pr : headerOut){
//替换掉默认的http头 for (auto &pr : headerOther){
headerOther[pr.first] = pr.second; //添加默认http头，默认http头不能覆盖用户自定义的头
const_cast<KeyValue &>(headerOut).emplace(pr.first,pr.second);
} }
sendResponse(codeOut.data(), headerOther, contentOut); sendResponse(codeOut.data(), headerOut, contentOut);
} }
inline void HttpSession::sendNotFound(bool bClose) { inline void HttpSession::sendNotFound(bool bClose) {
GET_CONFIG(string,notFound,Http::kNotFound); GET_CONFIG(string,notFound,Http::kNotFound);