Skip to content

Commit db93aeb

Browse files
xengine-qytxengine-qyt
committed
fixed:name space is incorrect for web dav
1 parent 6e82409 commit db93aeb

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.cpp‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ bool CProtocol_StoragePacket::Protocol_StoragePacket_BasicAuth(int nRequestType,
373373
}
374374
Json::Value st_JsonRoot;
375375

376-
st_JsonRoot["Type"] = nRequestType;
376+
st_JsonRoot["nRequestType"] = nRequestType;
377377
st_JsonRoot["lpszMethod"] = lpszMethod;
378378
st_JsonRoot["lpszPostUrl"] = lpszPostUrl;
379379
st_JsonRoot["lpszClientAddr"] = lpszClientAddr;
@@ -837,55 +837,55 @@ bool CProtocol_StoragePacket::Protocol_StoragePacket_WDPropfind(XCHAR* ptszMsgBu
837837
if (Session_Webdav_Get(tszFileAlis, &st_WDLocker))
838838
{
839839
// 子元素 <lockdiscovery>
840-
XMLElement* pSt_XMLLockDiscovery = m_XMLDocument.NewElement("D:lockdiscovery");
840+
XMLElement* pSt_XMLLockDiscovery = m_XMLDocument.NewElement("d:lockdiscovery");
841841
pSt_XMLProp->InsertEndChild(pSt_XMLLockDiscovery);
842842
// 子元素 <activelock>
843-
XMLElement* pSt_XMLLockActive = m_XMLDocument.NewElement("D:activelock");
843+
XMLElement* pSt_XMLLockActive = m_XMLDocument.NewElement("d:activelock");
844844
pSt_XMLLockDiscovery->InsertEndChild(pSt_XMLLockActive);
845845
// 子元素 <locktype>
846-
XMLElement* pSt_XMLLockType = m_XMLDocument.NewElement("D:locktype");
846+
XMLElement* pSt_XMLLockType = m_XMLDocument.NewElement("d:locktype");
847847
pSt_XMLLockActive->InsertEndChild(pSt_XMLLockType);
848848
if (1 == st_WDLocker.byLockOP)
849849
{
850-
XMLElement* pSt_XMLLockWrite = m_XMLDocument.NewElement("D:write");
850+
XMLElement* pSt_XMLLockWrite = m_XMLDocument.NewElement("d:write");
851851
pSt_XMLLockType->InsertEndChild(pSt_XMLLockWrite);
852852
}
853853
else if (2 == st_WDLocker.byLockOP)
854854
{
855-
XMLElement* pSt_XMLLockRead = m_XMLDocument.NewElement("D:read");
855+
XMLElement* pSt_XMLLockRead = m_XMLDocument.NewElement("d:read");
856856
pSt_XMLLockType->InsertEndChild(pSt_XMLLockRead);
857857
}
858858
// 子元素 <lockscope>
859-
XMLElement* pSt_XMLLockScope = m_XMLDocument.NewElement("D:lockscope");
859+
XMLElement* pSt_XMLLockScope = m_XMLDocument.NewElement("d:lockscope");
860860
pSt_XMLLockActive->InsertEndChild(pSt_XMLLockScope);
861861
if (1 == st_WDLocker.byLockType)
862862
{
863-
XMLElement* pSt_XMLLockExclusive = m_XMLDocument.NewElement("D:exclusive");
863+
XMLElement* pSt_XMLLockExclusive = m_XMLDocument.NewElement("d:exclusive");
864864
pSt_XMLLockScope->InsertEndChild(pSt_XMLLockExclusive);
865865
}
866866
else if (2 == st_WDLocker.byLockType)
867867
{
868-
XMLElement* pSt_XMLLockShared = m_XMLDocument.NewElement("D:shared");
868+
XMLElement* pSt_XMLLockShared = m_XMLDocument.NewElement("d:shared");
869869
pSt_XMLLockScope->InsertEndChild(pSt_XMLLockShared);
870870
}
871871
// 子元素 <depth>
872-
XMLElement* pSt_XMLDepth = m_XMLDocument.NewElement("D:depth");
872+
XMLElement* pSt_XMLDepth = m_XMLDocument.NewElement("d:depth");
873873
pSt_XMLDepth->SetText(_X("Infinity"));
874874
pSt_XMLLockActive->InsertEndChild(pSt_XMLDepth);
875875
// 子元素 <owner>
876-
XMLElement* pSt_XMLOwner = m_XMLDocument.NewElement("D:owner");
876+
XMLElement* pSt_XMLOwner = m_XMLDocument.NewElement("d:owner");
877877
pSt_XMLLockActive->InsertEndChild(pSt_XMLOwner);
878-
XMLElement* pSt_XMHRef = m_XMLDocument.NewElement("D:href");
878+
XMLElement* pSt_XMHRef = m_XMLDocument.NewElement("d:href");
879879
pSt_XMHRef->SetText(st_WDLocker.tszOwner);
880880
pSt_XMLOwner->InsertEndChild(pSt_XMHRef);
881881
// 子元素 <timeout>
882-
XMLElement* pSt_XMLTimeout = m_XMLDocument.NewElement("D:timeout");
882+
XMLElement* pSt_XMLTimeout = m_XMLDocument.NewElement("d:timeout");
883883
pSt_XMLTimeout->SetText(st_WDLocker.tszTimeout);
884884
pSt_XMLLockActive->InsertEndChild(pSt_XMLTimeout);
885885
// 子元素 <locktoken>
886-
XMLElement* pSt_XMLLockToken = m_XMLDocument.NewElement("D:locktoken");
886+
XMLElement* pSt_XMLLockToken = m_XMLDocument.NewElement("d:locktoken");
887887
pSt_XMLLockActive->InsertEndChild(pSt_XMLLockToken);
888-
XMLElement* pSt_XMHTokenRef = m_XMLDocument.NewElement("D:href");
888+
XMLElement* pSt_XMHTokenRef = m_XMLDocument.NewElement("d:href");
889889
pSt_XMHTokenRef->SetText(st_WDLocker.tszToken);
890890
pSt_XMLLockToken->InsertEndChild(pSt_XMHTokenRef);
891891
}
@@ -979,55 +979,55 @@ bool CProtocol_StoragePacket::Protocol_StoragePacket_WDLock(XCHAR* ptszMsgBuffer
979979
pSt_XMLRoot->SetAttribute("xmlns:d", "DAV:");
980980
m_XMLDocument.InsertEndChild(pSt_XMLRoot);
981981
// 子元素 <lockdiscovery>
982-
XMLElement* pSt_XMLLockDiscovery = m_XMLDocument.NewElement("D:lockdiscovery");
982+
XMLElement* pSt_XMLLockDiscovery = m_XMLDocument.NewElement("d:lockdiscovery");
983983
pSt_XMLRoot->InsertEndChild(pSt_XMLLockDiscovery);
984984
// 子元素 <activelock>
985-
XMLElement* pSt_XMLLockActive = m_XMLDocument.NewElement("D:activelock");
985+
XMLElement* pSt_XMLLockActive = m_XMLDocument.NewElement("d:activelock");
986986
pSt_XMLLockDiscovery->InsertEndChild(pSt_XMLLockActive);
987987
// 子元素 <locktype>
988-
XMLElement* pSt_XMLLockType = m_XMLDocument.NewElement("D:locktype");
988+
XMLElement* pSt_XMLLockType = m_XMLDocument.NewElement("d:locktype");
989989
pSt_XMLLockActive->InsertEndChild(pSt_XMLLockType);
990990
if (1 == pSt_WDLock->byLockOP)
991991
{
992-
XMLElement* pSt_XMLLockWrite = m_XMLDocument.NewElement("D:write");
992+
XMLElement* pSt_XMLLockWrite = m_XMLDocument.NewElement("d:write");
993993
pSt_XMLLockType->InsertEndChild(pSt_XMLLockWrite);
994994
}
995995
else if (2 == pSt_WDLock->byLockOP)
996996
{
997-
XMLElement* pSt_XMLLockRead = m_XMLDocument.NewElement("D:read");
997+
XMLElement* pSt_XMLLockRead = m_XMLDocument.NewElement("d:read");
998998
pSt_XMLLockType->InsertEndChild(pSt_XMLLockRead);
999999
}
10001000
// 子元素 <lockscope>
1001-
XMLElement* pSt_XMLLockScope = m_XMLDocument.NewElement("D:lockscope");
1001+
XMLElement* pSt_XMLLockScope = m_XMLDocument.NewElement("d:lockscope");
10021002
pSt_XMLLockActive->InsertEndChild(pSt_XMLLockScope);
10031003
if (1 == pSt_WDLock->byLockType)
10041004
{
1005-
XMLElement* pSt_XMLLockExclusive = m_XMLDocument.NewElement("D:exclusive");
1005+
XMLElement* pSt_XMLLockExclusive = m_XMLDocument.NewElement("d:exclusive");
10061006
pSt_XMLLockScope->InsertEndChild(pSt_XMLLockExclusive);
10071007
}
10081008
else if (2 == pSt_WDLock->byLockType)
10091009
{
1010-
XMLElement* pSt_XMLLockShared = m_XMLDocument.NewElement("D:shared");
1010+
XMLElement* pSt_XMLLockShared = m_XMLDocument.NewElement("d:shared");
10111011
pSt_XMLLockScope->InsertEndChild(pSt_XMLLockShared);
10121012
}
10131013
// 子元素 <depth>
1014-
XMLElement* pSt_XMLDepth = m_XMLDocument.NewElement("D:depth");
1014+
XMLElement* pSt_XMLDepth = m_XMLDocument.NewElement("d:depth");
10151015
pSt_XMLDepth->SetText(_X("Infinity"));
10161016
pSt_XMLLockActive->InsertEndChild(pSt_XMLDepth);
10171017
// 子元素 <owner>
1018-
XMLElement* pSt_XMLOwner = m_XMLDocument.NewElement("D:owner");
1018+
XMLElement* pSt_XMLOwner = m_XMLDocument.NewElement("d:owner");
10191019
pSt_XMLLockActive->InsertEndChild(pSt_XMLOwner);
1020-
XMLElement* pSt_XMHRef = m_XMLDocument.NewElement("D:href");
1020+
XMLElement* pSt_XMHRef = m_XMLDocument.NewElement("d:href");
10211021
pSt_XMHRef->SetText(pSt_WDLock->tszOwner);
10221022
pSt_XMLOwner->InsertEndChild(pSt_XMHRef);
10231023
// 子元素 <timeout>
1024-
XMLElement* pSt_XMLTimeout = m_XMLDocument.NewElement("D:timeout");
1024+
XMLElement* pSt_XMLTimeout = m_XMLDocument.NewElement("d:timeout");
10251025
pSt_XMLTimeout->SetText(pSt_WDLock->tszTimeout);
10261026
pSt_XMLLockActive->InsertEndChild(pSt_XMLTimeout);
10271027
// 子元素 <locktoken>
1028-
XMLElement* pSt_XMLLockToken = m_XMLDocument.NewElement("D:locktoken");
1028+
XMLElement* pSt_XMLLockToken = m_XMLDocument.NewElement("d:locktoken");
10291029
pSt_XMLLockActive->InsertEndChild(pSt_XMLLockToken);
1030-
XMLElement* pSt_XMHTokenRef = m_XMLDocument.NewElement("D:href");
1030+
XMLElement* pSt_XMHTokenRef = m_XMLDocument.NewElement("d:href");
10311031
pSt_XMHTokenRef->SetText(pSt_WDLock->tszToken);
10321032
pSt_XMLLockToken->InsertEndChild(pSt_XMHTokenRef);
10331033
// 将 XML 数据保存到字符串
@@ -1087,17 +1087,17 @@ bool CProtocol_StoragePacket::Protocol_StoragePacket_WDPropPatch(XCHAR* ptszMsgB
10871087
pSt_XMLRoot->SetAttribute("xmlns:d", "DAV:");
10881088
m_XMLDocument.InsertEndChild(pSt_XMLRoot);
10891089
// 子元素 <response>
1090-
XMLElement* pSt_XMLResponse = m_XMLDocument.NewElement("D:response");
1090+
XMLElement* pSt_XMLResponse = m_XMLDocument.NewElement("d:response");
10911091
pSt_XMLRoot->InsertEndChild(pSt_XMLResponse);
10921092
// 子元素 <href>
1093-
XMLElement* pSt_XMLHRef = m_XMLDocument.NewElement("D:href");
1093+
XMLElement* pSt_XMLHRef = m_XMLDocument.NewElement("d:href");
10941094
pSt_XMLHRef->SetText(lpszFileName);
10951095
pSt_XMLResponse->InsertEndChild(pSt_XMLHRef);
10961096
// 子元素 <propstat>
1097-
XMLElement* pSt_XMLPropStat = m_XMLDocument.NewElement("D:propstat");
1097+
XMLElement* pSt_XMLPropStat = m_XMLDocument.NewElement("d:propstat");
10981098
pSt_XMLResponse->InsertEndChild(pSt_XMLPropStat);
10991099
// 子元素 <prop>
1100-
XMLElement* pSt_XMLProp = m_XMLDocument.NewElement("D:prop");
1100+
XMLElement* pSt_XMLProp = m_XMLDocument.NewElement("d:prop");
11011101
pSt_XMLPropStat->InsertEndChild(pSt_XMLProp);
11021102
// 子元素
11031103
for (auto stl_ListIterator = pStl_ListName->begin(); stl_ListIterator != pStl_ListName->end(); stl_ListIterator++)
@@ -1106,7 +1106,7 @@ bool CProtocol_StoragePacket::Protocol_StoragePacket_WDPropPatch(XCHAR* ptszMsgB
11061106
pSt_XMLProp->InsertEndChild(pSt_XMLListValue);
11071107
}
11081108
// 子元素 <status>
1109-
XMLElement* pSt_XMLStatus = m_XMLDocument.NewElement("D:status");
1109+
XMLElement* pSt_XMLStatus = m_XMLDocument.NewElement("d:status");
11101110
pSt_XMLStatus->SetText("HTTP/1.1 200 OK");
11111111
pSt_XMLPropStat->InsertEndChild(pSt_XMLStatus);
11121112
// 将 XML 数据保存到字符串

0 commit comments

Comments
 (0)