Added support range requests

awwit · awwit · commit 83a1a1434f25 · 2014-07-06T19:31:29.000+03:00
diff --git a/httpserver.userprefs b/httpserver.userprefs
@@ -2,12 +2,12 @@
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.Workbench ActiveDocument="httpserver/Server.cpp">
     <Files>
-      <File FileName="httpserver/Server.cpp" Line="70" Column="3" />
-      <File FileName="httpserver/Server.h" Line="1" Column="1" />
+      <File FileName="httpserver/Server.cpp" Line="32" Column="12" />
+      <File FileName="httpserver/Server.h" Line="45" Column="1" />
       <File FileName="httpserver/Main.cpp" Line="1" Column="1" />
       <File FileName="httpserver/Main.h" Line="1" Column="1" />
       <File FileName="httpserver/DataVariantMultipartFormData.h" Line="1" Column="1" />
-      <File FileName="httpserver/DataVariantMultipartFormData.cpp" Line="1" Column="1" />
+      <File FileName="httpserver/DataVariantMultipartFormData.cpp" Line="11" Column="45" />
       <File FileName="httpserver/ServerRequest.h" Line="1" Column="1" />
       <File FileName="httpserver/ServerResponse.h" Line="1" Column="1" />
       <File FileName="httpserver/Event.cpp" 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="86" Column="2" />
+      <File FileName="httpserver/Socket.cpp" Line="1" Column="1" />
       <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/DataVariantAbstract.h b/httpserver/DataVariantAbstract.h
@@ -27,7 +27,7 @@ namespace HttpServer
 		/**
 		 * @param const Socket & - сокет, откуда можно достать остальные данные
 		 * @param const std::chrono::milliseconds & - максимальное время ожидания данных (на сокете)
-		 * @param const std::string - первая часть полученных данных
+		 * @param const std::string & - первая часть полученных данных
 		 * @param const size_t - сколько осталось данных (в байтах) получить из сокета
 		 * @param const std::unordered_map<std::string, std::string> & - дополнительные параметры, описывающие формат данных
 		 * @param std::unordered_multimap<std::string, std::string> & - данные в виде ключ->значение
@@ -39,7 +39,7 @@ namespace HttpServer
 		(
 			const Socket &,
 			const std::chrono::milliseconds &,
-			const std::string,
+			const std::string &,
 			const size_t,
 			const std::unordered_map<std::string, std::string> &,
 			std::unordered_multimap<std::string, std::string> &,
diff --git a/httpserver/DataVariantFormUrlencoded.cpp b/httpserver/DataVariantFormUrlencoded.cpp
@@ -12,7 +12,7 @@ namespace HttpServer
 	(
 		const Socket &sock,
 		const std::chrono::milliseconds &timeout,
-		const std::string str,
+		const std::string &str,
 		const size_t leftBytes,
 		const std::unordered_map<std::string, std::string> &params,
 		std::unordered_multimap<std::string, std::string> &data,
diff --git a/httpserver/DataVariantFormUrlencoded.h b/httpserver/DataVariantFormUrlencoded.h
@@ -14,7 +14,7 @@ namespace HttpServer
 		(
 			const Socket &,
 			const std::chrono::milliseconds &,
-			const std::string,
+			const std::string &,
 			const size_t,
 			const std::unordered_map<std::string, std::string> &,
 			std::unordered_multimap<std::string, std::string> &,
diff --git a/httpserver/DataVariantMultipartFormData.cpp b/httpserver/DataVariantMultipartFormData.cpp
@@ -57,7 +57,7 @@ namespace HttpServer
 	(
 		const Socket &sock,
 		const std::chrono::milliseconds &timeout,
-		const std::string str,
+		const std::string &str,
 		const size_t leftBytes,
 		const std::unordered_map<std::string, std::string> &params,
 		std::unordered_multimap<std::string, std::string> &data,
@@ -261,10 +261,10 @@ namespace HttpServer
 								if (headers.end() != filetype)
 								{
 									// Сгенерировать уникальное имя
-									std::string tmp_name = "/tmp/" + Utils::getUniqueName();
+									std::string tmp_name = System::getTempDir() + Utils::getUniqueName();
 
 									// Создать файл
-									std::ofstream file(tmp_name, std::ios_base::trunc);
+									std::ofstream file(tmp_name, std::ofstream::trunc | std::ofstream::binary);
 
 									// Если файл был создан и готов для работы
 									if (file.is_open() )
diff --git a/httpserver/DataVariantMultipartFormData.h b/httpserver/DataVariantMultipartFormData.h
@@ -26,7 +26,7 @@ namespace HttpServer
 		(
 			const Socket &,
 			const std::chrono::milliseconds &,
-			const std::string,
+			const std::string &,
 			const size_t,
 			const std::unordered_map<std::string, std::string> &,
 			std::unordered_multimap<std::string, std::string> &,
diff --git a/httpserver/DataVariantTextPlain.cpp b/httpserver/DataVariantTextPlain.cpp
@@ -12,7 +12,7 @@ namespace HttpServer
 	(
 		const Socket &sock,
 		const std::chrono::milliseconds &timeout,
-		const std::string str,
+		const std::string &str,
 		const size_t leftBytes,
 		const std::unordered_map<std::string, std::string> &params,
 		std::unordered_multimap<std::string, std::string> &data,
diff --git a/httpserver/DataVariantTextPlain.h b/httpserver/DataVariantTextPlain.h
@@ -14,7 +14,7 @@ namespace HttpServer
 		(
 			const Socket &,
 			const std::chrono::milliseconds &,
-			const std::string,
+			const std::string &,
 			const size_t,
 			const std::unordered_map<std::string, std::string> &,
 			std::unordered_multimap<std::string, std::string> &,
diff --git a/httpserver/Server.cpp b/httpserver/Server.cpp
diff --git a/httpserver/Server.h b/httpserver/Server.h

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace HttpServer`
`12`	`12`	`(`
`13`	`13`	`const Socket &sock,`
`14`	`14`	`const std::chrono::milliseconds &timeout,`
`15`		`- const std::string str,`
	`15`	`+ const std::string &str,`
`16`	`16`	`const size_t leftBytes,`
`17`	`17`	`const std::unordered_map<std::string, std::string> &params,`
`18`	`18`	`std::unordered_multimap<std::string, std::string> &data,`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace HttpServer`
`14`	`14`	`(`
`15`	`15`	`const Socket &,`
`16`	`16`	`const std::chrono::milliseconds &,`
`17`		`- const std::string,`
	`17`	`+ const std::string &,`
`18`	`18`	`const size_t,`
`19`	`19`	`const std::unordered_map<std::string, std::string> &,`
`20`	`20`	`std::unordered_multimap<std::string, std::string> &,`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace HttpServer`
`26`	`26`	`(`
`27`	`27`	`const Socket &,`
`28`	`28`	`const std::chrono::milliseconds &,`
`29`		`- const std::string,`
	`29`	`+ const std::string &,`
`30`	`30`	`const size_t,`
`31`	`31`	`const std::unordered_map<std::string, std::string> &,`
`32`	`32`	`std::unordered_multimap<std::string, std::string> &,`