Modified in order to add options on start. (SSL, DEBUG, PEDANTIC, IPV6)

Author: Sebastiano Merlino

src/HttpUtils.hpp

@@ -42,6 +42,13 @@ class HttpUtils
 		IA = GNUTLS_CRD_IA
 	};
 
+    enum StartMethod_T
+    {
+        INTERNAL_SELECT = MHD_USE_SELECT_INTERNALLY,
+        THREADS = MHD_USE_THREAD_PER_CONNECTION,
+        POOL = MHD_USE_POLL
+    };
+
 #ifdef SWIG
         %immutable;
 #endif

src/Webserver.cpp

@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <signal.h>
 #ifdef WITH_PYTHON
 #include <Python.h>
 #endif
@@ -40,6 +41,26 @@ void access_log(Webserver*, string);
 size_t unescaper_func(void*, struct MHD_Connection*, char*);
 size_t internal_unescaper(void*, struct MHD_Connection*, char*);
 
+static void catcher (int sig)
+{
+}
+
+static void ignore_sigpipe ()
+{
+    struct sigaction oldsig;
+    struct sigaction sig;
+
+    sig.sa_handler = &catcher;
+    sigemptyset (&sig.sa_mask);
+#ifdef SA_INTERRUPT
+    sig.sa_flags = SA_INTERRUPT;  /* SunOS */
+#else
+    sig.sa_flags = SA_RESTART;
+#endif
+    if (0 != sigaction (SIGPIPE, &sig, &oldsig))
+        fprintf (stderr, "Failed to install SIGPIPE handler: %s\n", strerror (errno));
+}
+
 //ENDPOINT
 HttpEndpoint::HttpEndpoint(bool family):
 	url_complete("/"),
@@ -753,15 +774,6 @@ const std::vector<std::pair<std::string, std::string> > HttpResponse::getHeaders
 	return toRet;
 }
 
-const std::vector<std::pair<std::string, std::string> > HttpResponse::getCookies() 
-{
-	std::vector<std::pair<std::string, std::string> > toRet;
-	map<string, string, HeaderComparator>::const_iterator it;
-	for(it = cookies.begin(); it != cookies.end(); it++)
-		toRet.push_back(make_pair<string, string>((*it).first,(*it).second));
-	return toRet;
-}
-
 const std::vector<std::pair<std::string, std::string> > HttpResponse::getFooters() 
 {
 	std::vector<std::pair<std::string, std::string> > toRet;
@@ -785,13 +797,6 @@ void HttpResponse::setFooters(const map<string, string>& footers)
 		this->footers[it->first] = it->second;
 }
 
-void HttpResponse::setCookies(const map<string, string>& cookies)
-{
-	map<string, string>::const_iterator it;
-	for(it = cookies.begin(); it != cookies.end(); it ++)
-		this->cookies[it->first] = it->second;
-}
-
 int HttpResponse::getResponseCode() 
 {
 	return this->responseCode;
@@ -829,6 +834,7 @@ void Unescaper::unescape(char* s) const {}
 Webserver::Webserver 
 (
 	const int port, 
+    const HttpUtils::StartMethod_T startMethod,
 	const int maxThreads, 
 	const int maxConnections,
 	const int memoryLimit,
@@ -838,6 +844,10 @@ Webserver::Webserver
 	const RequestValidator* validator,
 	const Unescaper* unescaper,
 	const int maxThreadStackSize,
+    const bool useSsl,
+    const bool useIpv6,
+    const bool debug,
+    const bool pedantic,
 	const string& httpsMemKey,
 	const string& httpsMemCert,
 	const string& httpsMemTrust,
@@ -855,6 +865,11 @@ Webserver::Webserver
 	logDelegate(logDelegate),
 	validator(validator),
 	unescaper(unescaper),
+    maxThreadStackSize(maxThreadStackSize),
+    useSsl(useSsl),
+    useIpv6(useIpv6),
+    debug(debug),
+    pedantic(pedantic),
 	httpsMemKey(httpsMemKey),
 	httpsMemCert(httpsMemCert),
 	httpsMemTrust(httpsMemTrust),
@@ -864,6 +879,7 @@ Webserver::Webserver
 	nonceNcSize(nonceNcSize),
 	running(false)
 {
+    ignore_sigpipe();
 }
 
 Webserver::~Webserver()
@@ -903,11 +919,9 @@ bool Webserver::start(bool blocking)
 	vector<struct MHD_OptionItem> iov;
 
 	iov.push_back(gen(MHD_OPTION_NOTIFY_COMPLETED, (intptr_t) &requestCompleted, NULL ));
-	iov.push_back(gen(MHD_OPTION_URI_LOG_CALLBACK, (intptr_t)&uri_log, this));
-	iov.push_back(gen(MHD_OPTION_EXTERNAL_LOGGER, (intptr_t)&error_log, this));
-	iov.push_back(gen(MHD_OPTION_UNESCAPE_CALLBACK, (intptr_t)&unescaper_func, this));
-	if(connectionTimeout == 0)
-		connectionTimeout = DEFAULT_DROP_WS_TIMEOUT;
+	iov.push_back(gen(MHD_OPTION_URI_LOG_CALLBACK, (intptr_t) &uri_log, this));
+	iov.push_back(gen(MHD_OPTION_EXTERNAL_LOGGER, (intptr_t) &error_log, this));
+	iov.push_back(gen(MHD_OPTION_UNESCAPE_CALLBACK, (intptr_t) &unescaper_func, this));
 	iov.push_back(gen(MHD_OPTION_CONNECTION_TIMEOUT, connectionTimeout));
 	if(maxThreads != 0)
 		iov.push_back(gen(MHD_OPTION_THREAD_POOL_SIZE, maxThreads));
@@ -942,9 +956,19 @@ bool Webserver::start(bool blocking)
 		ops[i] = iov[i];
 	}
 
+    int startConf = startMethod;
+    if(useSsl)
+        startConf |= MHD_USE_SSL;
+    if(useIpv6)
+        startConf |= MHD_USE_IPv6;
+    if(debug)
+        startConf |= MHD_USE_DEBUG;
+    if(pedantic)
+        startConf |= MHD_USE_PEDANTIC_CHECKS;
+
 	this->daemon = MHD_start_daemon
 	(
-			MHD_USE_SELECT_INTERNALLY, this->port, &policyCallback, this,
+			startConf, this->port, &policyCallback, this,
 			&answerToConnection, this, MHD_OPTION_ARRAY, ops, MHD_OPTION_END
 	);
 

src/Webserver.hpp

@@ -143,9 +143,8 @@ namespace std {
 #define METHOD_ERROR "{\"description\":\"METHOD NOT ALLOWED\"}"
 #define NOT_METHOD_ERROR "{\"description\":\"METHOD NOT ACCEPTABLE\"}"
 #define GENERIC_ERROR "{\"description\":\"INTERNAL ERROR\"}"
-
-#define DEFAULT_DROP_WS_PORT 9898
-#define DEFAULT_DROP_WS_TIMEOUT 180
+#define DEFAULT_WS_PORT 9898
+#define DEFAULT_WS_TIMEOUT 180
 
 #include <sys/types.h>
 #include <sys/select.h>
@@ -548,12 +547,6 @@ class HttpResponse
 		 * @param value The value assumed by the footer
 		**/
 		void setFooter(const std::string& key, const std::string& value);
-        /**
-         * Method used to set a cookie value by key.
-         * @param key The name identifying the cookie
-         * @param value The value assumed by the cookie
-        **/
-        void setCookie(const std::string& key, const std::string& value);
 		/**
 		 * Method used to set the content type for the request. This is a shortcut of setting the corresponding header.
 		 * @param contentType the content type to use for the request
@@ -574,11 +567,6 @@ class HttpResponse
 		 * @return a map<string,string> containing all footers.
 		**/
 		const std::vector<std::pair<std::string, std::string> > getFooters();
-		/**
-		 * Method used to get all cookies passed with the request.
-		 * @return a map<string,string> containing all cookies.
-		**/
-        const std::vector<std::pair<std::string, std::string> > getCookies();
 		/**
 		 * Method used to set all headers of the response.
 		 * @param headers The headers key-value map to set for the response.
@@ -611,7 +599,6 @@ class HttpResponse
 		int responseCode;
 		std::map<std::string, std::string, HeaderComparator> headers;
 		std::map<std::string, std::string, ArgComparator> footers;
-		std::map<std::string, std::string, HeaderComparator> cookies;
 		int fp;
 		std::string filename;
 };
@@ -808,6 +795,7 @@ class Webserver
 		/**
 		 * Constructor of the class.
 		 * @param port Integer representing the port the webserver is listening on.
+         * @param startMethod
 		 * @param maxThreads max number of serving threads (0 -> infty)
 		 * @param maxConnections max number of allowed connections (0 -> infty).
 		 * @param memoryLimit max memory allocated to serve requests (0 -> infty).
@@ -826,16 +814,21 @@ class Webserver
 		**/
 		Webserver
 		(
-			const int port = DEFAULT_DROP_WS_PORT, 
+			const int port = DEFAULT_WS_PORT, 
+            const HttpUtils::StartMethod_T startMethod = HttpUtils::INTERNAL_SELECT,
 			const int maxThreads = 0, 
 			const int maxConnections = 0,
 			const int memoryLimit = 0,
-			const int connectionTimeout = 0,
+			const int connectionTimeout = DEFAULT_WS_TIMEOUT,
 			const int perIPConnectionLimit = 0,
 			const LoggingDelegate* logDelegate = 0x0,
 			const RequestValidator* validator = 0x0,
 			const Unescaper* unescaper = 0x0,
 			const int maxThreadStackSize = 0,
+            const bool useSsl = false,
+            const bool useIpv6 = false,
+            const bool debug = false,
+            const bool pedantic = false,
 			const std::string& httpsMemKey = "",
 			const std::string& httpsMemCert = "",
 			const std::string& httpsMemTrust = "",
@@ -885,6 +878,10 @@ class Webserver
 		void sweetKill();
 	private:
 		bool running;
+        bool useSsl;
+        bool useIpv6;
+        bool debug;
+        bool pedantic;
 		int port;
 		int maxThreads;
 		int maxConnections;
@@ -902,6 +899,7 @@ class Webserver
 		std::string httpsPriorities;
 		std::string digestAuthRandom;
 		HttpUtils::CredType_T credType;
+        HttpUtils::StartMethod_T startMethod;
 
 		std::map<HttpEndpoint, HttpResource* > registeredResources;
 		struct MHD_Daemon *daemon;

src/autogen_helpers/.python_command.swo

@@ -109,7 +109,7 @@ CPPFLAGS =
 CXX = g++
 CXXCPP = g++ -E
 CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O0
+CXXFLAGS = -g -O2
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -232,9 +232,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/java/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/java/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign src/java/Makefile
+	  $(AUTOMAKE) --gnu src/java/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

src/java/Makefile

@@ -109,7 +109,7 @@ CPPFLAGS =
 CXX = g++
 CXXCPP = g++ -E
 CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O0
+CXXFLAGS = -g -O2
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -231,9 +231,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/php/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/php/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign src/php/Makefile
+	  $(AUTOMAKE) --gnu src/php/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

src/php/Makefile

@@ -107,7 +107,7 @@ CPPFLAGS =
 CXX = g++
 CXXCPP = g++ -E
 CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O0
+CXXFLAGS = -g -O2
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -229,9 +229,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/python/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/python/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign src/python/Makefile
+	  $(AUTOMAKE) --gnu src/python/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \