added:upload create ready supported

Author: xengine-qyt

XEngine_Source/StorageModule_Config/Config_Define.h

@@ -138,6 +138,7 @@ typedef struct
         bool bCreateDir;
         bool bRewrite;
         bool bUPLimit;
+        bool bUPReady;
     }st_PermissionFlags;
 }XENGINE_STORAGEBUCKET;
 typedef struct

XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp

@@ -446,6 +446,7 @@ bool CConfig_Json::Config_Json_LoadBalance(LPCXSTR lpszConfigFile, XENGINE_LBCON
 		st_Bucket.st_PermissionFlags.bCreateDir = st_JsonPermission["CreateDir"].asBool();
 		st_Bucket.st_PermissionFlags.bRewrite = st_JsonPermission["Rewrite"].asBool();
 		st_Bucket.st_PermissionFlags.bUPLimit = st_JsonPermission["UPLimit"].asBool();
+		st_Bucket.st_PermissionFlags.bUPReady = st_JsonPermission["bUPReady"].asBool();
 
 		pSt_ServerConfig->st_LoadBalance.pStl_ListBucket->push_back(st_Bucket);
 	}

XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp

@@ -203,12 +203,61 @@ bool XEngine_Task_HttpUPLoader(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, in
 			return false;
 		}
 	}
-	
+	//修正文件路径
 	int nPathType = 0;
 	_xstprintf(tszFileDir, _X("%s/%s"), st_StorageBucket.tszFilePath, tszFileName);
 	BaseLib_OperatorString_GetPath(tszFileDir, &nPathType);
 	BaseLib_OperatorString_FixPath(tszFileDir, nPathType);
+	//得到上传大小
+	XCHAR tszVluStr[8] = {};
+	if (HttpProtocol_ServerHelp_GetField(&pptszListHdr, nHdrCount, _X("Content-Length"), tszVluStr))
+	{
+		if (0 == _ttxoi(tszVluStr))
+		{
+			if (st_StorageBucket.st_PermissionFlags.bUPReady)
+			{
+				//文件是否存在
+				if (0 == _xtaccess(tszFileDir, 0) && !st_StorageBucket.st_PermissionFlags.bRewrite)
+				{
+					st_HDRParam.bIsClose = true;
+					st_HDRParam.nHttpCode = 403;
+					HttpProtocol_Server_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
+					XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
+					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("上传客户端:%s,准备上传文件:%s 失败,文件已经存在"), lpszClientAddr, tszFileDir);
+					return true;
+				}
+				//文件是否可写
+				FILE* pSt_File = _xtfopen(tszFileDir, _X("wb"));
+				if (NULL != pSt_File)
+				{
+					st_HDRParam.bIsClose = true;
+					st_HDRParam.nHttpCode = 403;
+					HttpProtocol_Server_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
+					XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
+					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("上传客户端:%s,准备上传文件:%s 失败,创建文件失败"), lpszClientAddr, tszFileDir);
+					return true;
+				}
+				fclose(pSt_File);
 
+				st_HDRParam.bIsClose = false;
+				st_HDRParam.nHttpCode = 201;
+				HttpProtocol_Server_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
+				XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
+				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("上传客户端:%s,准备上传文件:%s 成功"), lpszClientAddr, tszFileDir);
+				return true;
+			}
+			else
+			{
+				st_HDRParam.bIsClose = true;
+				st_HDRParam.nHttpCode = 403;
+				HttpProtocol_Server_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
+				XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
+				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("上传客户端:%s,准备上传文件:%s 失败,服务器关闭了UPReady,无法继续"), lpszClientAddr, pSt_HTTPParam->tszHttpUri);
+				return true;
+			}
+		}
+	}
+	//开始处理文件
 	if (!Session_UPStroage_Exist(lpszClientAddr))
 	{
 		int nPosStart = 0;

XEngine_Source/XEngine_StorageApp/StorageApp_Webdav.cpp

@@ -61,7 +61,7 @@ bool XEngine_Task_HttpWebdav(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 		//用于心跳
 		st_HDRParam.bIsClose = true;
 		st_HDRParam.nHttpCode = 200;
-		LPCXSTR lpszHdrBuffer = _X("Allow: POST GET PUT PROPFIND DELETE OPTIONS\r\n");
+		LPCXSTR lpszHdrBuffer = _X("Allow: OPTIONS POST GET PUT PROPFIND DELETE LOCK\r\n");
 		HttpProtocol_Server_SendMsgEx(xhWebdavHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, lpszHdrBuffer);
 		XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPWEBDAV);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("WEBDAV客户端:%s,请求OPTIONS心跳方法成功"), lpszClientAddr);