Added function to application for cleaning outgoing headers

awwit · awwit · commit 04df700fc030 · 2014-06-10T17:43:38.000+03:00
diff --git a/httpserverapp.userprefs b/httpserverapp.userprefs
@@ -1,16 +1,16 @@
 ﻿<Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.Workbench ActiveDocument="httpserverapp/Utils.cpp">
     <Files>
       <File FileName="httpserverapp/Main.h" Line="1" Column="1" />
-      <File FileName="httpserverapp/Main.cpp" Line="1" Column="1" />
+      <File FileName="httpserverapp/Main.cpp" Line="58" Column="2" />
       <File FileName="httpserverapp/ServerRequest.h" Line="1" Column="1" />
-      <File FileName="httpserverapp/ServerResponse.h" Line="1" Column="1" />
-      <File FileName="httpserverapp/Utils.h" Line="1" Column="1" />
+      <File FileName="httpserverapp/ServerResponse.h" Line="7" Column="1" />
+      <File FileName="httpserverapp/Utils.h" Line="47" Column="57" />
       <File FileName="httpserverapp/Test.h" Line="1" Column="1" />
-      <File FileName="httpserverapp/Test.cpp" Line="1" Column="1" />
+      <File FileName="httpserverapp/Test.cpp" Line="13" Column="2" />
       <File FileName="httpserverapp/Socket.h" Line="1" Column="1" />
-      <File FileName="httpserverapp/Utils.cpp" Line="245" Column="3" />
+      <File FileName="httpserverapp/Utils.cpp" Line="22" Column="2" />
       <File FileName="httpserverapp/Socket.cpp" Line="1" Column="1" />
       <File FileName="httpserverapp/System.h" Line="1" Column="1" />
       <File FileName="httpserverapp/RawData.h" Line="1" Column="1" />
diff --git a/httpserverapp/Main.cpp b/httpserverapp/Main.cpp
@@ -68,6 +68,14 @@ DLLEXPORT int application_call(HttpServer::server_request *request, HttpServer::
 	return result;
 }
 
+DLLEXPORT void application_clear(Utils::raw_pair headers[], const size_t headers_count)
+{
+	if (headers && headers_count)
+	{
+		destroyRawPairs(headers, headers_count);
+	}
+}
+
 DLLEXPORT void application_final()
 {
 	
diff --git a/httpserverapp/Test.cpp b/httpserverapp/Test.cpp
@@ -9,20 +9,8 @@ bool test(HttpServer::ServerRequest &request, HttpServer::ServerResponse &respon
 	HttpServer::Socket &socket = response.socket;
 	std::map<std::string, std::string> &headers_outgoing = response.headers;
 
-	headers_outgoing[""] = "HTTP/1.1 200 OK";
-	headers_outgoing["Content-Type"] = "text/html; charset=utf-8";
-	headers_outgoing["Connection"] = "keep-alive";
-//	headers_outgoing["Content-Type"] = "text/plain; charset=utf-8";
-//	headers_outgoing["Access-Control-Allow-Origin"] = "*";
-
-	size_t write_len;
-
 	std::string s;
 
-//	write_len = socket.send(s);
-
-//	s.clear();
-
 	for (auto h = incoming_headers.cbegin(); h != incoming_headers.cend(); ++h)
 	{
 		s += h->first + ":" + h->second + "\n";
@@ -35,7 +23,7 @@ bool test(HttpServer::ServerRequest &request, HttpServer::ServerResponse &respon
 		s += v->first + ": " + v->second + "\n";
 	}
 
-		s = "\
+/*		s = "\
 <table width=\"100%\">\
 <tr>\
 	<td>1<td>\
@@ -45,9 +33,15 @@ bool test(HttpServer::ServerRequest &request, HttpServer::ServerResponse &respon
 	<td>3<td>\
 	<td>4<td>\
 </tr>\
-</table>";
+</table>";*/
 
+	headers_outgoing[""] = "HTTP/1.1 200 OK";
+	headers_outgoing["Content-Type"] = "text/plain; charset=utf-8";
+//	headers_outgoing["Access-Control-Allow-Origin"] = "*";
+//	headers_outgoing["Content-Type"] = "text/html; charset=utf-8";
 	headers_outgoing["Content-Length"] = std::to_string(s.length() );
+	headers_outgoing["Connection"] = "keep-alive";
+	headers_outgoing["Date"] = Utils::getDatetimeStringValue();
 
 	std::string headers;
 
@@ -65,10 +59,16 @@ bool test(HttpServer::ServerRequest &request, HttpServer::ServerResponse &respon
 
 	headers_outgoing.clear();
 
-	s = headers + s;
+//	s = headers + s;
 
 	std::chrono::milliseconds timeout(5000);
-	write_len = socket.nonblock_send(s, timeout);
+
+	socket.nonblock_send(headers, timeout);
+
+	if ( (size_t)~0 == socket.nonblock_send(s, timeout) )
+	{
+		socket.close();
+	}
 
 	return EXIT_SUCCESS;
 }
diff --git a/httpserverapp/Test.h b/httpserverapp/Test.h
@@ -3,6 +3,8 @@
 #include "ServerRequest.h"
 #include "ServerResponse.h"
 
+#include "Utils.h"
+
 #include <cstdlib>
 
 bool test(HttpServer::ServerRequest &, HttpServer::ServerResponse &);

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,14 @@ DLLEXPORT int application_call(HttpServer::server_request *request, HttpServer::`
`68`	`68`	`return result;`
`69`	`69`	`}`
`70`	`70`
	`71`	`+DLLEXPORT void application_clear(Utils::raw_pair headers[], const size_t headers_count)`
	`72`	`+{`
	`73`	`+ if (headers && headers_count)`
	`74`	`+ {`
	`75`	`+ destroyRawPairs(headers, headers_count);`
	`76`	`+ }`
	`77`	`+}`
	`78`	`+`
`71`	`79`	`DLLEXPORT void application_final()`
`72`	`80`	`{`
`73`	`81`