Minor fix to Makefiles

Sebastiano Merlino · Sebastiano Merlino · commit 9c029ed0ea9c · 2012-03-09T17:23:20.000+01:00
diff --git a/configure.ac b/configure.ac
@@ -130,7 +130,7 @@ AC_MSG_RESULT([$debugit])
 
 if test x"$debugit" = x"yes"; then
     AC_DEFINE([DEBUG],[],[Debug Mode])
-    AM_CXXFLAGS="$AM_CXXFLAGS -g -Wall -Werror -Wno-uninitialized -O0"
+    AM_CXXFLAGS="$AM_CXXFLAGS -DDEBUG -g -Wall -Werror -Wno-uninitialized -O0"
 else
     AC_DEFINE([NDEBUG],[],[No-debug Mode])
     AM_CXXFLAGS="$AM_CXXFLAGS -O3"
@@ -312,7 +312,7 @@ if test x$guile = xtrue; then
 fi
 
 AC_SUBST(LHT_LIBDEPS)
-AC_SUBST([AM_CXXFLAGS])
+AC_SUBST(AM_CXXFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LIBS)
 AC_SUBST(LDFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -22,7 +22,7 @@ lib_LTLIBRARIES = libhttpserver.la
 libhttpserver_la_SOURCES = string_utilities.cpp Webserver.cpp HttpUtils.cpp HttpEndpoint.cpp HttpRequest.cpp HttpResponse.cpp HttpResource.cpp
 noinst_HEADERS = httpserver/string_utilities.hpp gettext.h
 nobase_include_HEADERS = httpserver.h httpserver/Webserver.hpp httpserver/HttpUtils.hpp httpserver/HttpEndpoint.hpp httpserver/HttpRequest.hpp httpserver/HttpResponse.hpp httpserver/HttpResource.hpp
-AM_CXXFLAGS = -fPIC -Wall
+AM_CXXFLAGS += -fPIC -Wall
 libhttpserver_la_LIBADD = -lmicrohttpd
 libhttpserver_la_LDFLAGS =
 
diff --git a/src/Webserver.cpp b/src/Webserver.cpp
@@ -530,6 +530,9 @@ int Webserver::answerToConnection(void* cls, MHD_Connection* connection,
 		}
 		if ( 0 != *upload_data_size)
 		{
+#ifdef DEBUG
+			cout << "Writing content: " << upload_data << endl;
+#endif
 			mr->dhr->growContent(upload_data, *upload_data_size);
 			*upload_data_size = 0;
 			return MHD_YES;
diff --git a/test/Test.cpp b/test/Test.cpp
@@ -4,6 +4,7 @@
 #include <unistd.h>
 #include <boost/thread.hpp>
 #include <iostream>
+#include <fstream>
 #include <stdio.h>
 using namespace std;
 
@@ -28,13 +29,12 @@ HttpResponse Test::render_GET(const HttpRequest& r)
 
 HttpResponse Test::render_POST(const HttpRequest& r)
 {
-	cout << r.getContent() << endl;
-	cout << "prova: " << r.getArg("prova") << endl;
-	
-	string pp = r.getArg("prova");
+	fstream filestr;
+	filestr.open("test.txt", fstream::out | fstream::app);
+	filestr << r.getContent() << endl;
+	filestr.close();
 	cout << "DOPO" << endl;
-
-	return HttpResponse(pp,200);
+	return HttpResponse("OK",200);
 }
 
 HttpResponse Test2::render_GET(const HttpRequest& r)

Original file line number	Diff line number	Diff line change
`@@ -530,6 +530,9 @@ int Webserver::answerToConnection(void* cls, MHD_Connection* connection,`
`530`	`530`	`}`
`531`	`531`	`if ( 0 != *upload_data_size)`
`532`	`532`	`{`
	`533`	`+#ifdef DEBUG`
	`534`	`+ cout << "Writing content: " << upload_data << endl;`
	`535`	`+#endif`
`533`	`536`	`mr->dhr->growContent(upload_data, *upload_data_size);`
`534`	`537`	`*upload_data_size = 0;`
`535`	`538`	`return MHD_YES;`