Moved to version 0.5.1

Sebastiano Merlino · Sebastiano Merlino · commit ca26232e0a86 · 2012-10-10T17:19:25.000+02:00
diff --git a/configure.ac b/configure.ac
@@ -21,8 +21,8 @@
 
 AC_PREREQ(2.57)
 m4_define([libhttpserver_MAJOR_VERSION],[0])dnl
-m4_define([libhttpserver_MINOR_VERSION],[4])dnl
-m4_define([libhttpserver_REVISION],[1])dnl
+m4_define([libhttpserver_MINOR_VERSION],[5])dnl
+m4_define([libhttpserver_REVISION],[0])dnl
 m4_define([libhttpserver_PKG_VERSION],[libhttpserver_MAJOR_VERSION.libhttpserver_MINOR_VERSION.libhttpserver_REVISION])dnl
 m4_define([libhttpserver_LDF_VERSION],[libhttpserver_MAJOR_VERSION:libhttpserver_MINOR_VERSION:libhttpserver_REVISION])dnl
 AC_INIT([libhttpserver], libhttpserver_PKG_VERSION, [electrictwister2000@gmail.com])
diff --git a/debian/changelog.in b/debian/changelog.in
@@ -1,3 +1,9 @@
+libhttpserver (0.5.1) unstable; urgency=low
+  * Stabilized comet support
+  * Added features to manage requests easily
+
+ -- Sebastiano Merlino <electrictwister2000@gmail.com> Tue, 10 Oct 2012 17:18:42 +0200
+
 libhttpserver (0.4.0) unstable; urgency=low
   * Added support to Comet
 
diff --git a/test/Test.cpp b/test/Test.cpp
@@ -10,12 +10,13 @@ using namespace std;
 
 webserver* ws_ptr;
 
+/*
 void signal_callback_handler(int signum)
 {
     cout << "bye!" << endl;
     ws_ptr->stop();
 }
-
+*/
 Test::Test() : http_resource() 
 {
 }
@@ -26,7 +27,7 @@ Test2::Test2() : http_resource()
 
 http_response Test::render_GET(const http_request& r)
 {
-	cout << r.get_version() << endl;
+/*	cout << r.get_version() << endl;
 	cout << r.get_requestor() << endl;
 	cout << r.get_requestor_port() << endl;
 	cout << "PROVA: " << r.get_arg("prova") << endl;
@@ -37,13 +38,17 @@ http_response Test::render_GET(const http_request& r)
     r.get_headers(head);
     for(std::map<std::string, std::string, header_comparator>::const_iterator it = head.begin(); it != head.end(); ++it)
         cout << (*it).first <<  "-> " << (*it).second << endl;
-	string pp = r.get_arg("prova");
-	return http_file_response("/home/etr/progs/libhttpserver/test/noimg.png", 200, "image/png");
+	string pp = r.get_arg("prova"); */
+    std::vector<std::string> topics;
+    topics.push_back("prova");
+    //return long_polling_receive_response("", 200, "", topics, 10, "keepalive\n");
+    cout << r.get_querystring() << endl;
+    return http_file_response("/home/etr/progs/libhttpserver/test/noimg.png", 200, "image/png");
 }
 
 http_response Test::render_POST(const http_request& r)
 {
-	fstream filestr;
+/*	fstream filestr;
 	filestr.open("test.txt", fstream::out | fstream::app);
 	filestr << r.get_content() << endl;
 	filestr.close();
@@ -53,7 +58,11 @@ http_response Test::render_POST(const http_request& r)
     {
         cout << vv[i] << endl;
     }
-	return http_string_response("OK",200);
+	return http_string_response("OK",200);*/
+	http_string_response s("OK",200);
+    s.set_header(http_utils::http_header_location, "B");
+    return s;
+ //   return long_polling_send_response("<script type=\"text/javascript\">alert(\"ciao\")</script>\n", "prova");
 }
 
 http_response Test2::render_GET(const http_request& r)
@@ -69,7 +78,7 @@ http_response Test::render_PUT(const http_request& r)
 
 int main()
 {
-    signal(SIGINT, &signal_callback_handler);
+//    signal(SIGINT, &signal_callback_handler);
 	webserver ws = create_webserver(8080);
     ws_ptr = &ws;
 	Test dt = Test();

Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,13 @@ using namespace std;`
`10`	`10`
`11`	`11`	`webserver* ws_ptr;`
`12`	`12`
	`13`	`+/*`
`13`	`14`	`void signal_callback_handler(int signum)`
`14`	`15`	`{`
`15`	`16`	`cout << "bye!" << endl;`
`16`	`17`	`ws_ptr->stop();`
`17`	`18`	`}`
`18`		`-`
	`19`	`+*/`
`19`	`20`	`Test::Test() : http_resource()`
`20`	`21`	`{`
`21`	`22`	`}`
`@@ -26,7 +27,7 @@ Test2::Test2() : http_resource()`
`26`	`27`
`27`	`28`	`http_response Test::render_GET(const http_request& r)`
`28`	`29`	`{`
`29`		`- cout << r.get_version() << endl;`
	`30`	`+/* cout << r.get_version() << endl;`
`30`	`31`	`cout << r.get_requestor() << endl;`
`31`	`32`	`cout << r.get_requestor_port() << endl;`
`32`	`33`	`cout << "PROVA: " << r.get_arg("prova") << endl;`
`@@ -37,13 +38,17 @@ http_response Test::render_GET(const http_request& r)`
`37`	`38`	`r.get_headers(head);`
`38`	`39`	`for(std::map<std::string, std::string, header_comparator>::const_iterator it = head.begin(); it != head.end(); ++it)`
`39`	`40`	`cout << (it).first << "-> " << (it).second << endl;`
`40`		`- string pp = r.get_arg("prova");`
`41`		`- return http_file_response("/home/etr/progs/libhttpserver/test/noimg.png", 200, "image/png");`
	`41`	`+ string pp = r.get_arg("prova"); */`
	`42`	`+ std::vector<std::string> topics;`
	`43`	`+ topics.push_back("prova");`
	`44`	`+ //return long_polling_receive_response("", 200, "", topics, 10, "keepalive\n");`
	`45`	`+ cout << r.get_querystring() << endl;`
	`46`	`+ return http_file_response("/home/etr/progs/libhttpserver/test/noimg.png", 200, "image/png");`
`42`	`47`	`}`
`43`	`48`
`44`	`49`	`http_response Test::render_POST(const http_request& r)`
`45`	`50`	`{`
`46`		`- fstream filestr;`
	`51`	`+/* fstream filestr;`
`47`	`52`	`filestr.open("test.txt", fstream::out \| fstream::app);`
`48`	`53`	`filestr << r.get_content() << endl;`
`49`	`54`	`filestr.close();`
`@@ -53,7 +58,11 @@ http_response Test::render_POST(const http_request& r)`
`53`	`58`	`{`
`54`	`59`	`cout << vv[i] << endl;`
`55`	`60`	`}`
`56`		`- return http_string_response("OK",200);`
	`61`	`+ return http_string_response("OK",200);*/`
	`62`	`+ http_string_response s("OK",200);`
	`63`	`+ s.set_header(http_utils::http_header_location, "B");`
	`64`	`+ return s;`
	`65`	`+ // return long_polling_send_response("<script type=\"text/javascript\">alert(\"ciao\")</script>\n", "prova");`
`57`	`66`	`}`
`58`	`67`
`59`	`68`	`http_response Test2::render_GET(const http_request& r)`
`@@ -69,7 +78,7 @@ http_response Test::render_PUT(const http_request& r)`
`69`	`78`
`70`	`79`	`int main()`
`71`	`80`	`{`
`72`		`- signal(SIGINT, &signal_callback_handler);`
	`81`	`+// signal(SIGINT, &signal_callback_handler);`
`73`	`82`	`webserver ws = create_webserver(8080);`
`74`	`83`	`ws_ptr = &ws;`
`75`	`84`	`Test dt = Test();`