Fixed bug when transferring binary files

awwit · awwit · commit 19fa047de89b · 2014-06-16T17:04:16.000+03:00
diff --git a/httpserver.userprefs b/httpserver.userprefs
@@ -1,8 +1,8 @@
 ﻿<Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="httpserver/ServerApplicationSettings.h">
+  <MonoDevelop.Ide.Workbench ActiveDocument="httpserver/Server.cpp">
     <Files>
-      <File FileName="httpserver/Server.cpp" Line="933" Column="11" />
+      <File FileName="httpserver/Server.cpp" Line="70" Column="3" />
       <File FileName="httpserver/Server.h" Line="1" Column="1" />
       <File FileName="httpserver/Main.cpp" Line="1" Column="1" />
       <File FileName="httpserver/Main.h" Line="1" Column="1" />
@@ -14,7 +14,7 @@
       <File FileName="httpserver/DataVariantAbstract.h" Line="1" Column="1" />
       <File FileName="httpserver/DataVariantFormUrlencoded.h" Line="1" Column="1" />
       <File FileName="httpserver/DataVariantFormUrlencoded.cpp" Line="1" Column="1" />
-      <File FileName="httpserver/ServerApplicationSettings.h" Line="16" Column="27" />
+      <File FileName="httpserver/ServerApplicationSettings.h" Line="1" Column="1" />
       <File FileName="httpserver/ServerApplicationsTree.h" Line="1" Column="1" />
       <File FileName="httpserver/ServerApplicationsTree.cpp" Line="1" Column="1" />
       <File FileName="httpserver/Module.h" Line="1" Column="1" />
@@ -25,7 +25,7 @@
       <File FileName="httpserver/SignalsHandles.cpp" Line="1" Column="1" />
       <File FileName="httpserver/SignalsHandles.h" Line="1" Column="1" />
       <File FileName="httpserver/System.cpp" Line="1" Column="1" />
-      <File FileName="httpserver/Socket.cpp" Line="1" Column="1" />
+      <File FileName="httpserver/Socket.cpp" Line="86" Column="2" />
       <File FileName="httpserver/Utils.h" Line="1" Column="1" />
       <File FileName="httpserver/Utils.cpp" Line="1" Column="1" />
       <File FileName="httpserver/Socket.h" Line="1" Column="1" />
diff --git a/httpserver/Server.cpp b/httpserver/Server.cpp
@@ -66,7 +66,7 @@ namespace HttpServer
 		// TODO: Range check
 
 		// TODO: file transfer
-		std::ifstream file(fileName);
+		std::ifstream file(fileName, std::ifstream::in | std::ifstream::binary);
 
 		if ( ! file)
 		{

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ namespace HttpServer`
`66`	`66`	`// TODO: Range check`
`67`	`67`
`68`	`68`	`// TODO: file transfer`
`69`		`- std::ifstream file(fileName);`
	`69`	`+ std::ifstream file(fileName, std::ifstream::in \| std::ifstream::binary);`
`70`	`70`
`71`	`71`	`if ( ! file)`
`72`	`72`	`{`