Merge branch 'master' into develop

# Conflicts:
#	src/jsonrpccpp/server/connectors/httpserver.cpp
#	src/jsonrpccpp/server/connectors/httpserver.h
#	src/test/testhttpserver.cpp
#	src/test/testhttpserver.h

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: cinemast

src/jsonrpccpp/server/connectors/httpserver.cpp

@@ -153,10 +153,11 @@ void HttpServer::SetUrlHandler(const string &url,
   this->SetHandler(NULL);
 }
 
-MHD_Result HttpServer::callback(void *cls, MHD_Connection *connection,
-                                const char *url, const char *method,
-                                const char *version, const char *upload_data,
-                                size_t *upload_data_size, void **con_cls) {
+HttpServer::MicroHttpdResult HttpServer::callback(
+  void *cls, MHD_Connection *connection, const char *url,
+  const char *method, const char *version,
+  const char *upload_data, size_t *upload_data_size,
+  void **con_cls) {
   (void)version;
   if (*con_cls == NULL) {
     struct mhd_coninfo *client_connection = new mhd_coninfo;

src/jsonrpccpp/server/connectors/httpserver.h

@@ -65,7 +65,13 @@ class HttpServer : public AbstractServerConnector {
 
   void SetUrlHandler(const std::string &url, IClientConnectionHandler *handler);
 
-protected:
+private:
+#if MHD_VERSION >= 0x00097002
+  typedef MHD_Result MicroHttpdResult;
+#else
+  typedef int MicroHttpdResult;
+#endif
+
   int port;
   int threads;
   bool running;
@@ -79,10 +85,12 @@ class HttpServer : public AbstractServerConnector {
   std::map<std::string, IClientConnectionHandler *> urlhandler;
   struct sockaddr_in loopback_addr;
 
-  static MHD_Result callback(void *cls, struct MHD_Connection *connection,
-                      const char *url, const char *method, const char *version,
-                      const char *upload_data, size_t *upload_data_size,
-                      void **con_cls);
+  static MicroHttpdResult callback(void *cls, struct MHD_Connection *connection,
+                                   const char *url, const char *method,
+                                   const char *version,
+                                   const char *upload_data,
+                                   size_t *upload_data_size,
+                                   void **con_cls);
 
   IClientConnectionHandler *GetHandler(const std::string &url);
 };

src/test/testhttpserver.cpp

@@ -41,7 +41,8 @@ std::string TestHttpServer::GetHeader(const std::string &key) {
   return "";
 }
 
-MHD_Result TestHttpServer::callback(void *cls, MHD_Connection *connection,
+TestHttpServer::MicroHttpdResult TestHttpServer::callback(
+                             void *cls, MHD_Connection *connection,
                              const char *url, const char *method,
                              const char *version, const char *upload_data,
                              size_t *upload_data_size, void **con_cls) {
@@ -69,8 +70,9 @@ MHD_Result TestHttpServer::callback(void *cls, MHD_Connection *connection,
   return MHD_YES;
 }
 
-MHD_Result TestHttpServer::header_iterator(void *cls, MHD_ValueKind kind,
-                                    const char *key, const char *value) {
+TestHttpServer::MicroHttpdResult TestHttpServer::header_iterator(
+                                        void *cls, MHD_ValueKind kind,
+                                        const char *key, const char *value) {
   (void)kind;
   TestHttpServer *_this = static_cast<TestHttpServer *>(cls);
   _this->headers[key] = value;

src/test/testhttpserver.h

@@ -31,14 +31,20 @@ namespace jsonrpc {
             std::string GetHeader(const std::string &key);
 
         private:
+#if MHD_VERSION >= 0x00097002
+            typedef MHD_Result MicroHttpdResult;
+#else
+            typedef int MicroHttpdResult;
+#endif
+
             int port;
             MHD_Daemon* daemon;
             std::map<std::string,std::string> headers;
             std::string response;
 
-            static MHD_Result callback(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls);
+            static MicroHttpdResult callback(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls);
 
-            static MHD_Result header_iterator (void *cls, enum MHD_ValueKind kind, const char *key, const char *value);
+            static MicroHttpdResult header_iterator (void *cls, enum MHD_ValueKind kind, const char *key, const char *value);
     };
 
 } // namespace jsonrpc