Changed http_resource to use virtual istead of CRTP

Author: Sebastiano Merlino

ChangeLog

@@ -1,3 +1,6 @@
+Sat Jan 26 15:08:22 2016 +0100
+	Changed http_resource to use classic C++ polymorphism using virtual instead of CRTP
+
 Fri Jul 17 21:38:54 2015 +0000
 	Removed build dependency on pkg-config
 

configure.ac

@@ -21,8 +21,8 @@
 
 AC_PREREQ(2.57)
 m4_define([libhttpserver_MAJOR_VERSION],[0])dnl
-m4_define([libhttpserver_MINOR_VERSION],[9])dnl
-m4_define([libhttpserver_REVISION],[1])dnl
+m4_define([libhttpserver_MINOR_VERSION],[10])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])

debian/changelog.in

@@ -1,3 +1,8 @@
+libhttpserver (0.10.0) unstable; urgency=low
+    * Changed http_resource to use classic C++ polymorphism using virtual instead of CRTP
+
+ -- Sebastiano Merlino <electrictwister2000@gmail.com> Sat, 26 Jan 2016 15:08:22 +0100
+
 libhttpserver (0.9.1) unstable; urgency=low
     * Eliminated build dependency on pkg-config
 

examples/hello_world.cpp

@@ -23,7 +23,7 @@
 
 using namespace httpserver;
 
-class hello_world_resource : public http_resource<hello_world_resource> {
+class hello_world_resource : public http_resource {
 	public:
         void render(const http_request&, http_response**);
         void set_some_data(const std::string &s) {data = s;}

examples/service.cpp

@@ -27,7 +27,7 @@ using namespace httpserver;
 
 bool verbose=false;
 
-class service_resource: public http_resource<service_resource> {
+class service_resource: public http_resource {
 public:
 	service_resource();
 

src/Makefile.am

@@ -21,7 +21,7 @@ METASOURCES = AUTO
 lib_LTLIBRARIES = libhttpserver.la
 libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp http_utils.cpp http_request.cpp http_response.cpp http_resource.cpp details/comet_manager.cpp details/http_endpoint.cpp
 noinst_HEADERS = httpserver/string_utilities.hpp httpserver/details/modded_request.hpp httpserver/details/http_response_ptr.hpp httpserver/details/cache_entry.hpp httpserver/details/comet_manager.hpp gettext.h
-nobase_include_HEADERS = httpserver.hpp httpserver/create_webserver.hpp httpserver/webserver.hpp httpserver/http_utils.hpp httpserver/details/http_endpoint.hpp httpserver/http_request.hpp httpserver/http_response.hpp httpserver/http_resource.hpp httpserver/binders.hpp httpserver/event_supplier.hpp httpserver/details/event_tuple.hpp httpserver/details/http_resource_mirror.hpp httpserver/http_response_builder.hpp
+nobase_include_HEADERS = httpserver.hpp httpserver/create_webserver.hpp httpserver/webserver.hpp httpserver/http_utils.hpp httpserver/details/http_endpoint.hpp httpserver/http_request.hpp httpserver/http_response.hpp httpserver/http_resource.hpp httpserver/binders.hpp httpserver/event_supplier.hpp httpserver/details/event_tuple.hpp httpserver/http_response_builder.hpp
 
 AM_CXXFLAGS += -fPIC -Wall
 

src/http_resource.cpp

@@ -27,6 +27,7 @@
 #include "details/event_tuple.hpp"
 #include "webserver.hpp"
 #include "string_utilities.hpp"
+#include "http_response_builder.hpp"
 
 using namespace std;
 
@@ -45,4 +46,14 @@ void resource_init(map<string, bool>& allowed_methods)
     allowed_methods[MHD_HTTP_METHOD_OPTIONS] = true;
 }
 
+namespace details
+{
+
+void empty_render(const http_request& r, http_response** res)
+{
+    *res = new http_response(http_response_builder("", 200).string_response());
+}
+
+};
+
 };

src/http_response.cpp

@@ -25,7 +25,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include "http_utils.hpp"
-#include "details/http_resource_mirror.hpp"
 #include "details/event_tuple.hpp"
 #include "webserver.hpp"
 #include "http_response.hpp"
@@ -36,6 +35,8 @@ using namespace std;
 namespace httpserver
 {
 
+class webserver;
+
 http_response::http_response(const http_response_builder& builder):
     content(builder._content_hook),
     response_code(builder._response_code),

src/httpserver.hpp

@@ -31,7 +31,6 @@
 #include "httpserver/http_request.hpp"
 #include "httpserver/event_supplier.hpp"
 #include "httpserver/details/event_tuple.hpp"
-#include "httpserver/details/http_resource_mirror.hpp"
 #include "httpserver/webserver.hpp"
 
 #endif

src/httpserver/details/cache_entry.hpp

@@ -28,7 +28,6 @@
 #include <pthread.h>
 #include <set>
 #include "httpserver/details/http_response_ptr.hpp"
-#include "httpserver/http_response.hpp"
 
 namespace httpserver
 {