fixed:upload rewrite flag is not work

xengine-qyt · xengine-qyt · commit d475391ac802 · 2024-02-27T14:43:58.000+08:00
diff --git a/XEngine_Source/StorageModule_Session/Session_Stroage/Session_UPStroage.cpp b/XEngine_Source/StorageModule_Session/Session_Stroage/Session_UPStroage.cpp
@@ -171,6 +171,13 @@ bool CSession_UPStroage::Session_UPStroage_Insert(LPCXSTR lpszClientAddr, LPCXST
 	}
 	else
 	{
+		if ((0 == _xtaccess(lpszFileDir, 0)) && !bRewrite)
+		{
+			Session_IsErrorOccur = true;
+			Session_dwErrorCode = ERROR_STORAGE_MODULE_SESSION_REWRITE;
+			return false;
+		}
+
 		st_Client.st_StorageInfo.pSt_File = _xtfopen(lpszFileDir, _X("wb"));
 		if (NULL == st_Client.st_StorageInfo.pSt_File)
 		{
diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp b/XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp
@@ -259,7 +259,7 @@ bool XEngine_Task_HttpUPLoader(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, in
 		if (!Session_UPStroage_Insert(lpszClientAddr, st_StorageBucket.tszBuckKey, tszFileDir, nPosCount, st_StorageBucket.st_PermissionFlags.bRewrite, nPosStart, nPosEnd))
 		{
 			st_HDRParam.bIsClose = true;
-			st_HDRParam.nHttpCode = 404;
+			st_HDRParam.nHttpCode = 500;
 
 			HttpProtocol_Server_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
 			XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,13 @@ bool CSession_UPStroage::Session_UPStroage_Insert(LPCXSTR lpszClientAddr, LPCXST`
`171`	`171`	`}`
`172`	`172`	`else`
`173`	`173`	`{`
	`174`	`+ if ((0 == _xtaccess(lpszFileDir, 0)) && !bRewrite)`
	`175`	`+ {`
	`176`	`+ Session_IsErrorOccur = true;`
	`177`	`+ Session_dwErrorCode = ERROR_STORAGE_MODULE_SESSION_REWRITE;`
	`178`	`+ return false;`
	`179`	`+ }`
	`180`	`+`
`174`	`181`	`st_Client.st_StorageInfo.pSt_File = _xtfopen(lpszFileDir, _X("wb"));`
`175`	`182`	`if (NULL == st_Client.st_StorageInfo.pSt_File)`
`176`	`183`	`{`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ bool XEngine_Task_HttpUPLoader(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, in`
`259`	`259`	`if (!Session_UPStroage_Insert(lpszClientAddr, st_StorageBucket.tszBuckKey, tszFileDir, nPosCount, st_StorageBucket.st_PermissionFlags.bRewrite, nPosStart, nPosEnd))`
`260`	`260`	`{`
`261`	`261`	`st_HDRParam.bIsClose = true;`
`262`		`- st_HDRParam.nHttpCode = 404;`
	`262`	`+ st_HDRParam.nHttpCode = 500;`
`263`	`263`
`264`	`264`	`HttpProtocol_Server_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);`
`265`	`265`	`XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);`