Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 347)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 348)
@@ -136,4 +136,7 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/187">#187</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/435">#435</a>] Updated the configuration
 			options in the ColdFusion integration files.</li>
+		<li>[<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&aid=1726781&group_id=75348&atid=543655">SF 
+			Patch-1726781</a>] Updated the upload class for asp to handle large files and other data 
+			in the forms. Thanks to NetRube.</li>
 	</ul>
 	<h3>
Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/class_upload.asp
===================================================================
--- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/class_upload.asp	(revision 347)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/class_upload.asp	(revision 348)
@@ -25,8 +25,8 @@
 '**********************************************
 ' File:		NetRube_Upload.asp
-' Version:	NetRube Upload Class Version 2.1 Build 20050228
+' Version:	NetRube Upload Class Version 2.3 Build 20070528
 ' Author:	NetRube
 ' Email:	NetRube@126.com
-' Date:		02/28/2005
+' Date:		05/28/2007
 ' Comments:	The code for the Upload.
 '			This can free usage, but please
@@ -36,8 +36,8 @@
 '**********************************************
 ' 文件名:	NetRube_Upload.asp
-' 版本:		NetRube Upload Class Version 2.1 Build 20050228
+' 版本:		NetRube Upload Class Version 2.3 Build 20070528
 ' 作者:		NetRube(网络乡巴佬)
 ' 电子邮件:	NetRube@126.com
-' 日期:		2005年02月28日
+' 日期:		2007年05月28日
 ' 声明:		文件上传类
 '			本上传类可以自由使用，但请保留此版权声明信息
@@ -51,14 +51,14 @@
 	Private oSourceData
 	Private nMaxSize, nErr, sAllowed, sDenied
-
+	
 	Private Sub Class_Initialize
 		nErr		= 0
 		nMaxSize	= 1048576
-
+		
 		Set File			= Server.CreateObject("Scripting.Dictionary")
 		File.CompareMode	= 1
 		Set Form			= Server.CreateObject("Scripting.Dictionary")
 		Form.CompareMode	= 1
-
+		
 		Set oSourceData		= Server.CreateObject("ADODB.Stream")
 		oSourceData.Type	= 1
@@ -66,5 +66,5 @@
 		oSourceData.Open
 	End Sub
-
+	
 	Private Sub Class_Terminate
 		Form.RemoveAll
@@ -72,11 +72,11 @@
 		File.RemoveAll
 		Set File = Nothing
-
+		
 		oSourceData.Close
 		Set oSourceData = Nothing
 	End Sub
-
+	
 	Public Property Get Version
-		Version = "NetRube Upload Class Version 1.0 Build 20041218"
+		Version = "NetRube Upload Class Version 2.3 Build 20070528"
 	End Property
 
@@ -84,13 +84,13 @@
 		ErrNum	= nErr
 	End Property
-
+	
 	Public Property Let MaxSize(nSize)
 		nMaxSize	= nSize
 	End Property
-
+	
 	Public Property Let Allowed(sExt)
 		sAllowed	= sExt
 	End Property
-
+	
 	Public Property Let Denied(sExt)
 		sDenied	= sExt
@@ -104,5 +104,5 @@
 			Exit Sub
 		End If
-
+		
 		Dim nTotalSize
 		nTotalSize	= Request.TotalBytes
@@ -115,10 +115,33 @@
 			Exit Sub
 		End If
-
-		oSourceData.Write Request.BinaryRead(nTotalSize)
+		
+		'Thankful long(yrl031715@163.com)
+		'Fix upload large file.
+		'**********************************************
+		' 修正作者：long
+		' 联系邮件: yrl031715@163.com
+		' 修正时间：2007年5月6日
+		' 修正说明：由于iis6的Content-Length 头信息中包含的请求长度超过了 AspMaxRequestEntityAllowed 的值（默认200K）, IIS 将返回一个 403 错误信息.
+		'          直接导致在iis6下调试FCKeditor上传功能时，一旦文件超过200K,上传文件时文件管理器失去响应，受此影响，文件的快速上传功能也存在在缺陷。
+		'          在参考 宝玉 的 Asp无组件上传带进度条 演示程序后作出如下修改，以修正在iis6下的错误。
+
+		Dim nTotalBytes, nPartBytes, ReadBytes
+		ReadBytes = 0
+		nTotalBytes = Request.TotalBytes
+		'循环分块读取
+		Do While ReadBytes < nTotalBytes
+			'分块读取
+			nPartBytes = 64 * 1024 '分成每块64k
+			If nPartBytes + ReadBytes > nTotalBytes Then 
+				nPartBytes = nTotalBytes - ReadBytes
+			End If
+			oSourceData.Write Request.BinaryRead(nPartBytes)
+			ReadBytes = ReadBytes + nPartBytes
+		Loop
+		'**********************************************
 		oSourceData.Position = 0
-
+		
 		Dim oTotalData, oFormStream, sFormHeader, sFormName, bCrLf, nBoundLen, nFormStart, nFormEnd, nPosStart, nPosEnd, sBoundary
-
+		
 		oTotalData	= oSourceData.Read
 		bCrLf		= ChrB(13) & ChrB(10)
@@ -126,10 +149,10 @@
 		nBoundLen	= LenB(sBoundary) + 2
 		nFormStart	= nBoundLen
-
+		
 		Set oFormStream = Server.CreateObject("ADODB.Stream")
-
+		
 		Do While (nFormStart + 2) < nTotalSize
 			nFormEnd	= InStrB(nFormStart, oTotalData, bCrLf & bCrLf) + 3
-
+			
 			With oFormStream
 				.Type	= 1
@@ -144,10 +167,10 @@
 				.Close
 			End With
-
+			
 			nFormStart	= InStrB(nFormEnd, oTotalData, sBoundary) - 1
 			nPosStart	= InStr(22, sFormHeader, " name=", 1) + 7
 			nPosEnd		= InStr(nPosStart, sFormHeader, """")
 			sFormName	= Mid(sFormHeader, nPosStart, nPosEnd - nPosStart)
-
+			
 			If InStr(45, sFormHeader, " filename=", 1) > 0 Then
 				Set File(sFormName)			= New NetRube_FileInfo
@@ -168,5 +191,5 @@
 					.Mode	= 3
 					.Open
-					oSourceData.Position = nPosEnd
+					oSourceData.Position = nFormEnd
 					oSourceData.CopyTo oFormStream, nFormStart - nFormEnd - 2
 					.Position	= 0
@@ -177,8 +200,8 @@
 				End With
 			End If
-
+			
 			nFormStart	= nFormStart + nBoundLen
 		Loop
-
+		
 		oTotalData = ""
 		Set oFormStream = Nothing
@@ -190,10 +213,10 @@
 			Exit Sub
 		End If
-
+		
 		If Not IsAllowed(File(sItem).Ext) Then
 			nErr = 4
 			Exit Sub
 		End If
-
+		
 		Dim oFileStream
 		Set oFileStream = Server.CreateObject("ADODB.Stream")
@@ -210,5 +233,5 @@
 		Set oFileStream = Nothing
 	End Sub
-
+	
 	Private Function IsAllowed(sExt)
 		Dim oRE
@@ -216,5 +239,5 @@
 		oRE.IgnoreCase	= True
 		oRE.Global		= True
-
+		
 		If sDenied = "" Then
 			oRE.Pattern	= sAllowed
@@ -224,5 +247,5 @@
 			IsAllowed	= Not oRE.Test(sExt)
 		End If
-
+		
 		Set oRE	= Nothing
 	End Function
@@ -232,3 +255,3 @@
 	Dim FormName, ClientPath, Path, Name, Ext, Content, Size, MIME, Start
 End Class
-%>
+%>
Index: /FCKeditor/trunk/editor/filemanager/upload/asp/class_upload.asp
===================================================================
--- /FCKeditor/trunk/editor/filemanager/upload/asp/class_upload.asp	(revision 347)
+++ /FCKeditor/trunk/editor/filemanager/upload/asp/class_upload.asp	(revision 348)
@@ -25,8 +25,8 @@
 '**********************************************
 ' File:		NetRube_Upload.asp
-' Version:	NetRube Upload Class Version 2.1 Build 20050228
+' Version:	NetRube Upload Class Version 2.3 Build 20070528
 ' Author:	NetRube
 ' Email:	NetRube@126.com
-' Date:		02/28/2005
+' Date:		05/28/2007
 ' Comments:	The code for the Upload.
 '			This can free usage, but please
@@ -36,8 +36,8 @@
 '**********************************************
 ' 文件名:	NetRube_Upload.asp
-' 版本:		NetRube Upload Class Version 2.1 Build 20050228
+' 版本:		NetRube Upload Class Version 2.3 Build 20070528
 ' 作者:		NetRube(网络乡巴佬)
 ' 电子邮件:	NetRube@126.com
-' 日期:		2005年02月28日
+' 日期:		2007年05月28日
 ' 声明:		文件上传类
 '			本上传类可以自由使用，但请保留此版权声明信息
@@ -51,14 +51,14 @@
 	Private oSourceData
 	Private nMaxSize, nErr, sAllowed, sDenied
-
+	
 	Private Sub Class_Initialize
 		nErr		= 0
 		nMaxSize	= 1048576
-
+		
 		Set File			= Server.CreateObject("Scripting.Dictionary")
 		File.CompareMode	= 1
 		Set Form			= Server.CreateObject("Scripting.Dictionary")
 		Form.CompareMode	= 1
-
+		
 		Set oSourceData		= Server.CreateObject("ADODB.Stream")
 		oSourceData.Type	= 1
@@ -66,5 +66,5 @@
 		oSourceData.Open
 	End Sub
-
+	
 	Private Sub Class_Terminate
 		Form.RemoveAll
@@ -72,11 +72,11 @@
 		File.RemoveAll
 		Set File = Nothing
-
+		
 		oSourceData.Close
 		Set oSourceData = Nothing
 	End Sub
-
+	
 	Public Property Get Version
-		Version = "NetRube Upload Class Version 1.0 Build 20041218"
+		Version = "NetRube Upload Class Version 2.3 Build 20070528"
 	End Property
 
@@ -84,13 +84,13 @@
 		ErrNum	= nErr
 	End Property
-
+	
 	Public Property Let MaxSize(nSize)
 		nMaxSize	= nSize
 	End Property
-
+	
 	Public Property Let Allowed(sExt)
 		sAllowed	= sExt
 	End Property
-
+	
 	Public Property Let Denied(sExt)
 		sDenied	= sExt
@@ -104,5 +104,5 @@
 			Exit Sub
 		End If
-
+		
 		Dim nTotalSize
 		nTotalSize	= Request.TotalBytes
@@ -115,10 +115,33 @@
 			Exit Sub
 		End If
-
-		oSourceData.Write Request.BinaryRead(nTotalSize)
+		
+		'Thankful long(yrl031715@163.com)
+		'Fix upload large file.
+		'**********************************************
+		' 修正作者：long
+		' 联系邮件: yrl031715@163.com
+		' 修正时间：2007年5月6日
+		' 修正说明：由于iis6的Content-Length 头信息中包含的请求长度超过了 AspMaxRequestEntityAllowed 的值（默认200K）, IIS 将返回一个 403 错误信息.
+		'          直接导致在iis6下调试FCKeditor上传功能时，一旦文件超过200K,上传文件时文件管理器失去响应，受此影响，文件的快速上传功能也存在在缺陷。
+		'          在参考 宝玉 的 Asp无组件上传带进度条 演示程序后作出如下修改，以修正在iis6下的错误。
+
+		Dim nTotalBytes, nPartBytes, ReadBytes
+		ReadBytes = 0
+		nTotalBytes = Request.TotalBytes
+		'循环分块读取
+		Do While ReadBytes < nTotalBytes
+			'分块读取
+			nPartBytes = 64 * 1024 '分成每块64k
+			If nPartBytes + ReadBytes > nTotalBytes Then 
+				nPartBytes = nTotalBytes - ReadBytes
+			End If
+			oSourceData.Write Request.BinaryRead(nPartBytes)
+			ReadBytes = ReadBytes + nPartBytes
+		Loop
+		'**********************************************
 		oSourceData.Position = 0
-
+		
 		Dim oTotalData, oFormStream, sFormHeader, sFormName, bCrLf, nBoundLen, nFormStart, nFormEnd, nPosStart, nPosEnd, sBoundary
-
+		
 		oTotalData	= oSourceData.Read
 		bCrLf		= ChrB(13) & ChrB(10)
@@ -126,10 +149,10 @@
 		nBoundLen	= LenB(sBoundary) + 2
 		nFormStart	= nBoundLen
-
+		
 		Set oFormStream = Server.CreateObject("ADODB.Stream")
-
+		
 		Do While (nFormStart + 2) < nTotalSize
 			nFormEnd	= InStrB(nFormStart, oTotalData, bCrLf & bCrLf) + 3
-
+			
 			With oFormStream
 				.Type	= 1
@@ -144,10 +167,10 @@
 				.Close
 			End With
-
+			
 			nFormStart	= InStrB(nFormEnd, oTotalData, sBoundary) - 1
 			nPosStart	= InStr(22, sFormHeader, " name=", 1) + 7
 			nPosEnd		= InStr(nPosStart, sFormHeader, """")
 			sFormName	= Mid(sFormHeader, nPosStart, nPosEnd - nPosStart)
-
+			
 			If InStr(45, sFormHeader, " filename=", 1) > 0 Then
 				Set File(sFormName)			= New NetRube_FileInfo
@@ -168,5 +191,5 @@
 					.Mode	= 3
 					.Open
-					oSourceData.Position = nPosEnd
+					oSourceData.Position = nFormEnd
 					oSourceData.CopyTo oFormStream, nFormStart - nFormEnd - 2
 					.Position	= 0
@@ -177,8 +200,8 @@
 				End With
 			End If
-
+			
 			nFormStart	= nFormStart + nBoundLen
 		Loop
-
+		
 		oTotalData = ""
 		Set oFormStream = Nothing
@@ -190,10 +213,10 @@
 			Exit Sub
 		End If
-
+		
 		If Not IsAllowed(File(sItem).Ext) Then
 			nErr = 4
 			Exit Sub
 		End If
-
+		
 		Dim oFileStream
 		Set oFileStream = Server.CreateObject("ADODB.Stream")
@@ -210,5 +233,5 @@
 		Set oFileStream = Nothing
 	End Sub
-
+	
 	Private Function IsAllowed(sExt)
 		Dim oRE
@@ -216,5 +239,5 @@
 		oRE.IgnoreCase	= True
 		oRE.Global		= True
-
+		
 		If sDenied = "" Then
 			oRE.Pattern	= sAllowed
@@ -224,5 +247,5 @@
 			IsAllowed	= Not oRE.Test(sExt)
 		End If
-
+		
 		Set oRE	= Nothing
 	End Function
@@ -232,3 +255,3 @@
 	Dim FormName, ClientPath, Path, Name, Ext, Content, Size, MIME, Start
 End Class
-%>
+%>
