73 files changed, 212 insertions, 198 deletions
diff --git a/src/examples/authorization_example.c b/src/examples/authorization_example.c
index 40bffcb7..644b03ef 100644
--- a/src/examples/authorization_example.c
+++ b/src/examples/authorization_example.c
@@ -39,7 +39,7 @@
  "<html><head><title>Access denied</title></head><body>Access denied</body></html>"
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -50,7 +50,7 @@ ahc_echo (void *cls,
  static int aptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  char *user;
  char *pass;
  int fail;
diff --git a/src/examples/benchmark.c b/src/examples/benchmark.c
index 9b07e5c8..939995c9 100644
--- a/src/examples/benchmark.c
+++ b/src/examples/benchmark.c
@@ -106,7 +106,7 @@ uri_logger_cb (void *cls,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
diff --git a/src/examples/benchmark_https.c b/src/examples/benchmark_https.c
index 53b83e0a..6f0cd478 100644
--- a/src/examples/benchmark_https.c
+++ b/src/examples/benchmark_https.c
@@ -106,7 +106,7 @@ uri_logger_cb (void *cls,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
diff --git a/src/examples/chunked_example.c b/src/examples/chunked_example.c
index 9b2cb51c..19a37155 100644
--- a/src/examples/chunked_example.c
+++ b/src/examples/chunked_example.c
@@ -86,7 +86,7 @@ static const char simple_response_text[] =
  "<body>Simple response text</body></html>";
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -99,7 +99,7 @@ ahc_echo (void *cls,
  static int aptr;
  struct ResponseContentCallbackParam *callback_param;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) cls;               /* Unused. Silent compiler warning. */
  (void) url;               /* Unused. Silent compiler warning. */
  (void) version;           /* Unused. Silent compiler warning. */
diff --git a/src/examples/demo.c b/src/examples/demo.c
index c7ad4b30..978bd235 100644
--- a/src/examples/demo.c
+++ b/src/examples/demo.c
@@ -264,7 +264,7 @@ struct ResponseDataContext
 * @param dirname name of the directory to list
 * @return #MHD_YES on success, #MHD_NO on error
 */
-static int
+static enum MHD_Result
 list_directory (struct ResponseDataContext *rdc,
                const char *dirname)
 {
@@ -444,7 +444,7 @@ struct UploadContext
 * @param size number of bytes in 'data'
 * @return #MHD_NO on allocation failure, #MHD_YES on success
 */
-static int
+static enum MHD_Result
 do_append (char **ret,
           const char *data,
           size_t size)
@@ -493,7 +493,7 @@ do_append (char **ret,
 * @return #MHD_YES to continue iterating,
 *         #MHD_NO to abort the iteration
 */
-static int
+static enum MHD_Result
 process_upload_data (void *cls,
                     enum MHD_ValueKind kind,
                     const char *key,
@@ -662,12 +662,12 @@ response_completed_callback (void *cls,
 * Return the current directory listing.
 *
 * @param connection connection to return the directory for
- * @return MHD_YES on success, MHD_NO on error
+ * @return #MHD_YES on success, #MHD_NO on error
 */
-static int
+static enum MHD_Result
 return_directory_response (struct MHD_Connection *connection)
 {
-  int ret;
+  enum MHD_Result ret;
  (void) pthread_mutex_lock (&mutex);
  if (NULL == cached_directory_response)
@@ -696,7 +696,7 @@ return_directory_response (struct MHD_Connection *connection)
 * @param ptr our context
 * @return #MHD_YES on success, #MHD_NO to drop connection
 */
-static int
+static enum MHD_Result
 generate_page (void *cls,
               struct MHD_Connection *connection,
               const char *url,
@@ -706,7 +706,7 @@ generate_page (void *cls,
               size_t *upload_data_size, void **ptr)
 {
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  int fd;
  struct stat buf;
  (void) cls;               /* Unused. Silent compiler warning. */
diff --git a/src/examples/demo_https.c b/src/examples/demo_https.c
index 7cd98b68..2a60fcda 100644
--- a/src/examples/demo_https.c
+++ b/src/examples/demo_https.c
@@ -267,7 +267,7 @@ struct ResponseDataContext
 * @param dirname name of the directory to list
 * @return MHD_YES on success, MHD_NO on error
 */
-static int
+static enum MHD_Result
 list_directory (struct ResponseDataContext *rdc,
                const char *dirname)
 {
@@ -447,7 +447,7 @@ struct UploadContext
 * @param size number of bytes in 'data'
 * @return #MHD_NO on allocation failure, #MHD_YES on success
 */
-static int
+static enum MHD_Result
 do_append (char **ret,
           const char *data,
           size_t size)
@@ -493,10 +493,10 @@ do_append (char **ret,
 *              specified offset
 * @param off offset of data in the overall value
 * @param size number of bytes in data available
- * @return MHD_YES to continue iterating,
+ * @return #MHD_YES to continue iterating,
- *         MHD_NO to abort the iteration
+ *         #MHD_NO to abort the iteration
 */
-static int
+static enum MHD_Result
 process_upload_data (void *cls,
                     enum MHD_ValueKind kind,
                     const char *key,
@@ -667,10 +667,10 @@ response_completed_callback (void *cls,
 * @param connection connection to return the directory for
 * @return MHD_YES on success, MHD_NO on error
 */
-static int
+static enum MHD_Result
 return_directory_response (struct MHD_Connection *connection)
 {
-  int ret;
+  enum MHD_Result ret;
  (void) pthread_mutex_lock (&mutex);
  if (NULL == cached_directory_response)
@@ -699,7 +699,7 @@ return_directory_response (struct MHD_Connection *connection)
 * @param ptr our context
 * @return #MHD_YES on success, #MHD_NO to drop connection
 */
-static int
+static enum MHD_Result
 generate_page (void *cls,
               struct MHD_Connection *connection,
               const char *url,
@@ -709,7 +709,7 @@ generate_page (void *cls,
               size_t *upload_data_size, void **ptr)
 {
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  int fd;
  struct stat buf;
  (void) cls;               /* Unused. Silent compiler warning. */
diff --git a/src/examples/digest_auth_example.c b/src/examples/digest_auth_example.c
index 25fb4086..e3edf206 100644
--- a/src/examples/digest_auth_example.c
+++ b/src/examples/digest_auth_example.c
@@ -34,7 +34,7 @@
 #define MY_OPAQUE_STR "11733b200778ce33060f31c9af70a870ba96ddd4"
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -46,7 +46,7 @@ ahc_echo (void *cls,
  char *username;
  const char *password = "testpass";
  const char *realm = "test@example.com";
-  int ret;
+  enum MHD_Result ret;
  (void) cls;               /* Unused. Silent compiler warning. */
  (void) url;               /* Unused. Silent compiler warning. */
  (void) method;            /* Unused. Silent compiler warning. */
diff --git a/src/examples/dual_stack_example.c b/src/examples/dual_stack_example.c
index ffacec4a..15bafc44 100644
--- a/src/examples/dual_stack_example.c
+++ b/src/examples/dual_stack_example.c
@@ -28,7 +28,7 @@
 #define PAGE \
  "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -39,7 +39,7 @@ ahc_echo (void *cls,
  static int aptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) url;               /* Unused. Silent compiler warning. */
  (void) version;           /* Unused. Silent compiler warning. */
  (void) upload_data;       /* Unused. Silent compiler warning. */
diff --git a/src/examples/fileserver_example.c b/src/examples/fileserver_example.c
index 46e6aad6..767810f9 100644
--- a/src/examples/fileserver_example.c
+++ b/src/examples/fileserver_example.c
@@ -41,7 +41,7 @@
 #define S_ISREG(x) (S_IFREG == (x & S_IFREG))
 #endif /* S_ISREG */
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -52,7 +52,7 @@ ahc_echo (void *cls,
 {
  static int aptr;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  int fd;
  struct stat buf;
  (void) cls;               /* Unused. Silent compiler warning. */
diff --git a/src/examples/fileserver_example_dirs.c b/src/examples/fileserver_example_dirs.c
index 2b544b69..e6c9ed1f 100644
--- a/src/examples/fileserver_example_dirs.c
+++ b/src/examples/fileserver_example_dirs.c
@@ -81,7 +81,7 @@ dir_reader (void *cls, uint64_t pos, char *buf, size_t max)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -92,7 +92,7 @@ ahc_echo (void *cls,
 {
  static int aptr;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  FILE *file;
  int fd;
  DIR *dir;
diff --git a/src/examples/fileserver_example_external_select.c b/src/examples/fileserver_example_external_select.c
index 187cdf7e..7209751f 100644
--- a/src/examples/fileserver_example_external_select.c
+++ b/src/examples/fileserver_example_external_select.c
@@ -48,7 +48,7 @@ free_callback (void *cls)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -59,7 +59,7 @@ ahc_echo (void *cls,
 {
  static int aptr;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  FILE *file;
  int fd;
  struct stat buf;
diff --git a/src/examples/http_chunked_compression.c b/src/examples/http_chunked_compression.c
index ba71923b..07fd00ec 100644
--- a/src/examples/http_chunked_compression.c
+++ b/src/examples/http_chunked_compression.c
@@ -51,13 +51,13 @@ struct Holder
  void *buf;
 };
-static int
+static enum MHD_Result
 compress_buf (z_stream *strm, const void *src, size_t src_size, size_t *offset,
              void **dest, size_t *dest_size,
              void *tmp)
 {
  unsigned int have;
-  int ret;
+  enum MHD_Result ret;
  int flush;
  void *tmp_dest;
  *dest = NULL;
@@ -152,14 +152,14 @@ free_cb (void *cls)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls, struct MHD_Connection *con, const char *url, const
          char *method, const char *version,
          const char *upload_data, size_t *upload_size, void **ptr)
 {
  struct Holder *holder;
  struct MHD_Response *res;
-  int ret;
+  enum MHD_Result ret;
  (void) cls;
  (void) url;
  (void) method;
diff --git a/src/examples/http_compression.c b/src/examples/http_compression.c
index f7d8db21..0419a803 100644
--- a/src/examples/http_compression.c
+++ b/src/examples/http_compression.c
@@ -31,7 +31,7 @@
  "hello, hello. This is a 'hello world' message for the world, "   \
  "repeat, for the world.</body></html>"
-static int
+static enum MHD_Result
 can_compress (struct MHD_Connection *con)
 {
  const char *ae;
@@ -60,7 +60,7 @@ can_compress (struct MHD_Connection *con)
 }
-static int
+static enum MHD_Result
 body_compress (void **buf,
               size_t *buf_size)
 {
@@ -90,7 +90,7 @@ body_compress (void **buf,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -99,8 +99,8 @@ ahc_echo (void *cls,
          const char *upload_data, size_t *upload_data_size, void **ptr)
 {
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
-  int comp;
+  enum MHD_Result comp;
  size_t body_len;
  char *body_str;
  (void) cls;               /* Unused. Silent compiler warning. */
diff --git a/src/examples/https_fileserver_example.c b/src/examples/https_fileserver_example.c
index 627bc739..5148c8b6 100644
--- a/src/examples/https_fileserver_example.c
+++ b/src/examples/https_fileserver_example.c
@@ -113,7 +113,7 @@ file_free_callback (void *cls)
 /* HTTP access handler call back */
-static int
+static enum MHD_Result
 http_ahc (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -124,7 +124,7 @@ http_ahc (void *cls,
 {
  static int aptr;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  FILE *file;
  int fd;
  struct stat buf;
diff --git a/src/examples/minimal_example.c b/src/examples/minimal_example.c
index d6589cf9..a02b5d50 100644
--- a/src/examples/minimal_example.c
+++ b/src/examples/minimal_example.c
@@ -28,7 +28,7 @@
 #define PAGE \
  "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -41,7 +41,7 @@ ahc_echo (void *cls,
  static int aptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) url;               /* Unused. Silent compiler warning. */
  (void) version;           /* Unused. Silent compiler warning. */
diff --git a/src/examples/minimal_example_comet.c b/src/examples/minimal_example_comet.c
index 80c4258a..c36bf2ce 100644
--- a/src/examples/minimal_example_comet.c
+++ b/src/examples/minimal_example_comet.c
@@ -38,7 +38,7 @@ data_generator (void *cls, uint64_t pos, char *buf, size_t max)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -48,7 +48,7 @@ ahc_echo (void *cls,
 {
  static int aptr;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) cls;               /* Unused. Silent compiler warning. */
  (void) url;               /* Unused. Silent compiler warning. */
  (void) version;           /* Unused. Silent compiler warning. */
diff --git a/src/examples/minimal_example_empty.c b/src/examples/minimal_example_empty.c
index 2de1cc8b..986a2504 100644
--- a/src/examples/minimal_example_empty.c
+++ b/src/examples/minimal_example_empty.c
@@ -26,7 +26,7 @@
 #include <microhttpd.h>
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -38,7 +38,7 @@ ahc_echo (void *cls,
 {
  static int aptr;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) url;               /* Unused. Silent compiler warning. */
  (void) version;           /* Unused. Silent compiler warning. */
diff --git a/src/examples/minimal_example_empty_tls.c b/src/examples/minimal_example_empty_tls.c
index e3daca5f..0b9a0e25 100644
--- a/src/examples/minimal_example_empty_tls.c
+++ b/src/examples/minimal_example_empty_tls.c
@@ -26,7 +26,7 @@
 #include <microhttpd.h>
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -38,7 +38,7 @@ ahc_echo (void *cls,
 {
  static int aptr;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) url;               /* Unused. Silent compiler warning. */
  (void) version;           /* Unused. Silent compiler warning. */
diff --git a/src/examples/post_example.c b/src/examples/post_example.c
index 885cdb1a..55ca3aa8 100644
--- a/src/examples/post_example.c
+++ b/src/examples/post_example.c
@@ -205,10 +205,10 @@ get_session (struct MHD_Connection *connection)
 * @param connection connection to process
 * @param MHD_YES on success, MHD_NO on failure
 */
-typedef int (*PageHandler)(const void *cls,
+typedef enum MHD_Result (*PageHandler)(const void *cls,
-                           const char *mime,
+                                       const char *mime,
-                           struct Session *session,
+                                       struct Session *session,
-                           struct MHD_Connection *connection);
+                                       struct MHD_Connection *connection);
 /**
@@ -274,13 +274,13 @@ add_session_cookie (struct Session *session,
 * @param session session handle
 * @param connection connection to use
 */
-static int
+static enum MHD_Result
 serve_simple_form (const void *cls,
                   const char *mime,
                   struct Session *session,
                   struct MHD_Connection *connection)
 {
-  int ret;
+  enum MHD_Result ret;
  const char *form = cls;
  struct MHD_Response *response;
@@ -310,13 +310,13 @@ serve_simple_form (const void *cls,
 * @param session session handle
 * @param connection connection to use
 */
-static int
+static enum MHD_Result
 fill_v1_form (const void *cls,
              const char *mime,
              struct Session *session,
              struct MHD_Connection *connection)
 {
-  int ret;
+  enum MHD_Result ret;
  size_t slen;
  char *reply;
  struct MHD_Response *response;
@@ -359,13 +359,13 @@ fill_v1_form (const void *cls,
 * @param session session handle
 * @param connection connection to use
 */
-static int
+static enum MHD_Result
 fill_v1_v2_form (const void *cls,
                 const char *mime,
                 struct Session *session,
                 struct MHD_Connection *connection)
 {
-  int ret;
+  enum MHD_Result ret;
  char *reply;
  struct MHD_Response *response;
  size_t slen;
@@ -410,13 +410,13 @@ fill_v1_v2_form (const void *cls,
 * @param session session handle
 * @param connection connection to use
 */
-static int
+static enum MHD_Result
 not_found_page (const void *cls,
                const char *mime,
                struct Session *session,
                struct MHD_Connection *connection)
 {
-  int ret;
+  enum MHD_Result ret;
  struct MHD_Response *response;
  (void) cls;     /* Unused. Silent compiler warning. */
  (void) session; /* Unused. Silent compiler warning. */
@@ -469,7 +469,7 @@ static struct Page pages[] = {
 * @return MHD_YES to continue iterating,
 *         MHD_NO to abort the iteration
 */
-static int
+static enum MHD_Result
 post_iterator (void *cls,
               enum MHD_ValueKind kind,
               const char *key,
@@ -554,7 +554,7 @@ post_iterator (void *cls,
 *         MHS_NO if the socket must be closed due to a serios
 *         error while handling the request
 */
-static int
+static enum MHD_Result
 create_response (void *cls,
                 struct MHD_Connection *connection,
                 const char *url,
@@ -567,7 +567,7 @@ create_response (void *cls,
  struct MHD_Response *response;
  struct Request *request;
  struct Session *session;
-  int ret;
+  enum MHD_Result ret;
  unsigned int i;
  (void) cls;               /* Unused. Silent compiler warning. */
  (void) version;           /* Unused. Silent compiler warning. */
diff --git a/src/examples/querystring_example.c b/src/examples/querystring_example.c
index 8abd8596..4bff891a 100644
--- a/src/examples/querystring_example.c
+++ b/src/examples/querystring_example.c
@@ -29,7 +29,7 @@
 #define PAGE \
  "<html><head><title>libmicrohttpd demo</title></head><body>Query string for &quot;%s&quot; was &quot;%s&quot;</body></html>"
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -42,7 +42,7 @@ ahc_echo (void *cls,
  const char *val;
  char *me;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) url;               /* Unused. Silent compiler warning. */
  (void) version;           /* Unused. Silent compiler warning. */
  (void) upload_data;       /* Unused. Silent compiler warning. */
diff --git a/src/examples/refuse_post_example.c b/src/examples/refuse_post_example.c
index 3a34f36d..7e100d9f 100644
--- a/src/examples/refuse_post_example.c
+++ b/src/examples/refuse_post_example.c
@@ -35,7 +35,7 @@ const char *askpage =
 #define BUSYPAGE \
  "<html><head><title>Webserver busy</title></head><body>We are too busy to process POSTs right now.</body></html>"
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -46,7 +46,7 @@ ahc_echo (void *cls,
  static int aptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) cls;               /* Unused. Silent compiler warning. */
  (void) url;               /* Unused. Silent compiler warning. */
  (void) version;           /* Unused. Silent compiler warning. */
diff --git a/src/examples/suspend_resume_epoll.c b/src/examples/suspend_resume_epoll.c
index a69fdc4a..afa1169c 100644
--- a/src/examples/suspend_resume_epoll.c
+++ b/src/examples/suspend_resume_epoll.c
@@ -43,7 +43,7 @@ static int epfd;
 static struct epoll_event evt;
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -52,7 +52,7 @@ ahc_echo (void *cls,
          const char *upload_data, size_t *upload_data_size, void **ptr)
 {
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  struct Request*req;
  struct itimerspec ts;
diff --git a/src/examples/timeout.c b/src/examples/timeout.c
index cfb66950..b31ff21f 100644
--- a/src/examples/timeout.c
+++ b/src/examples/timeout.c
@@ -29,7 +29,7 @@
 #define PORT 8080
-static int
+static enum MHD_Result
 answer_to_connection (void *cls,
                      struct MHD_Connection *connection,
                      const char *url,
@@ -41,7 +41,7 @@ answer_to_connection (void *cls,
 {
  const char *page = "<html><body>Hello timeout!</body></html>";
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) cls;               /* Unused. Silent compiler warning. */
  (void) url;               /* Unused. Silent compiler warning. */
  (void) version;           /* Unused. Silent compiler warning. */
diff --git a/src/examples/upgrade_example.c b/src/examples/upgrade_example.c
index 98675e09..85a06646 100644
--- a/src/examples/upgrade_example.c
+++ b/src/examples/upgrade_example.c
@@ -240,7 +240,7 @@ uh_cb (void *cls,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -252,7 +252,7 @@ ahc_echo (void *cls,
 {
  static int aptr;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) cls;               /* Unused. Silent compiler warning. */
  (void) url;               /* Unused. Silent compiler warning. */
  (void) version;           /* Unused. Silent compiler warning. */
diff --git a/src/microhttpd/test_daemon.c b/src/microhttpd/test_daemon.c
index 4f600ef0..430c8e18 100644
--- a/src/microhttpd/test_daemon.c
+++ b/src/microhttpd/test_daemon.c
@@ -52,7 +52,7 @@ testStartError ()
 }
-static int
+static enum MHD_Result
 apc_nothing (void *cls,
             const struct sockaddr *addr,
             socklen_t addrlen)
@@ -63,7 +63,7 @@ apc_nothing (void *cls,
 }
-static int
+static enum MHD_Result
 apc_all (void *cls,
         const struct sockaddr *addr,
         socklen_t addrlen)
@@ -74,7 +74,7 @@ apc_all (void *cls,
 }
-static int
+static enum MHD_Result
 ahc_nothing (void *cls,
             struct MHD_Connection *connection,
             const char *url,
diff --git a/src/microhttpd/test_postprocessor.c b/src/microhttpd/test_postprocessor.c
index 2c37565c..e70171cc 100644
--- a/src/microhttpd/test_postprocessor.c
+++ b/src/microhttpd/test_postprocessor.c
@@ -92,7 +92,7 @@ mismatch (const char *a, const char *b)
 }
-static int
+static enum MHD_Result
 value_checker (void *cls,
               enum MHD_ValueKind kind,
               const char *key,
@@ -140,10 +140,10 @@ value_checker (void *cls,
    fprintf (stderr,
             "Wanted: `%s' `%s' `%s' `%s' `%s'\n",
             want[idx],
-             want[idx+1],
+             want[idx + 1],
-             want[idx+2],
+             want[idx + 2],
-             want[idx+3],
+             want[idx + 3],
-             want[idx+4]);
+             want[idx + 4]);
    fprintf (stderr,
             "Unexpected result: %d/%d/%d/%d/%d/%d/%d\n",
             (idx < 0),
@@ -155,7 +155,7 @@ value_checker (void *cls,
             (0 != memcmp (data, &want[idx + 4][off], size)));
    return MHD_NO;
  }
-  if ( ( (NULL == want[idx+4]) &&
+  if ( ( (NULL == want[idx + 4]) &&
         (0 == off + size) ) ||
       (off + size == strlen (want[idx + 4])) )
    *want_off = idx + 5;
diff --git a/src/microhttpd/test_postprocessor_amp.c b/src/microhttpd/test_postprocessor_amp.c
index 54936979..8692d443 100644
--- a/src/microhttpd/test_postprocessor_amp.c
+++ b/src/microhttpd/test_postprocessor_amp.c
@@ -7,7 +7,7 @@
 uint64_t num_errors;
-int
+enum MHD_Result
 check_post (void *cls, enum MHD_ValueKind kind, const char*key,
            const char*filename, const char*content_type,
            const char*content_encoding, const char*data,
diff --git a/src/microhttpd/test_postprocessor_large.c b/src/microhttpd/test_postprocessor_large.c
index 0e2a10d2..678de808 100644
--- a/src/microhttpd/test_postprocessor_large.c
+++ b/src/microhttpd/test_postprocessor_large.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #endif
-static int
+static enum MHD_Result
 value_checker (void *cls,
               enum MHD_ValueKind kind,
               const char *key,
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index 404c2854..b3aecafa 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -843,7 +843,7 @@ upgrade_cb (void *cls,
 *         #MHD_NO if the socket must be closed due to a serios
 *         error while handling the request
 */
-static int
+static enum MHD_Result
 ahc_upgrade (void *cls,
             struct MHD_Connection *connection,
             const char *url,
@@ -854,7 +854,7 @@ ahc_upgrade (void *cls,
             void **con_cls)
 {
  struct MHD_Response *resp;
-  int ret;
+  enum MHD_Result ret;
  (void) cls;
  (void) url;
  (void) method;                        /* Unused. Silent compiler warning. */
diff --git a/src/microhttpd/test_upgrade_large.c b/src/microhttpd/test_upgrade_large.c
index a17293db..d8d35838 100644
--- a/src/microhttpd/test_upgrade_large.c
+++ b/src/microhttpd/test_upgrade_large.c
@@ -867,7 +867,7 @@ upgrade_cb (void *cls,
 *         #MHD_NO if the socket must be closed due to a serios
 *         error while handling the request
 */
-static int
+static enum MHD_Result
 ahc_upgrade (void *cls,
             struct MHD_Connection *connection,
             const char *url,
@@ -878,7 +878,7 @@ ahc_upgrade (void *cls,
             void **con_cls)
 {
  struct MHD_Response *resp;
-  int ret;
+  enum MHD_Result ret;
  (void) cls;
  (void) url;
  (void) method;                        /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/https/test_empty_response.c b/src/testcurl/https/test_empty_response.c
index 6f29fbe5..28430388 100644
--- a/src/testcurl/https/test_empty_response.c
+++ b/src/testcurl/https/test_empty_response.c
@@ -38,7 +38,7 @@ extern const char srv_self_signed_cert_pem[];
 static int oneone;
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -48,7 +48,7 @@ ahc_echo (void *cls,
          void **unused)
 {
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) cls; (void) url; (void) method; (void) version;               /* Unused. Silent compiler warning. */
  (void) upload_data; (void) upload_data_size; (void) unused;        /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/https/test_https_get.c b/src/testcurl/https/test_https_get.c
index c012fa46..b8de81a9 100644
--- a/src/testcurl/https/test_https_get.c
+++ b/src/testcurl/https/test_https_get.c
@@ -91,7 +91,7 @@ test_secure_get (FILE *test_fd,
 }
-static int
+static enum MHD_Result
 ahc_empty (void *cls,
           struct MHD_Connection *connection,
           const char *url,
@@ -103,7 +103,7 @@ ahc_empty (void *cls,
 {
  static int ptr;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) cls;
  (void) url;
  (void) url;
diff --git a/src/testcurl/https/test_https_get_select.c b/src/testcurl/https/test_https_get_select.c
index e5bd73f5..d42f4463 100644
--- a/src/testcurl/https/test_https_get_select.c
+++ b/src/testcurl/https/test_https_get_select.c
@@ -39,7 +39,7 @@ extern const char srv_self_signed_cert_pem[];
 static int oneone;
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -51,7 +51,7 @@ ahc_echo (void *cls,
  static int ptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) version; (void) upload_data; (void) upload_data_size;       /* Unused. Silent compiler warning. */
  if (0 != strcmp (me, method))
diff --git a/src/testcurl/https/test_https_session_info.c b/src/testcurl/https/test_https_session_info.c
index e961edc4..f8b37cff 100644
--- a/src/testcurl/https/test_https_session_info.c
+++ b/src/testcurl/https/test_https_session_info.c
@@ -41,14 +41,15 @@ struct MHD_Daemon *d;
 * HTTP access handler call back
 * used to query negotiated security parameters
 */
-static int
+static enum MHD_Result
 query_session_ahc (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 **ptr)
 {
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
+  int gret;
  (void) cls; (void) url; (void) method; (void) version;       /* Unused. Silent compiler warning. */
  (void) upload_data; (void) upload_data_size;             /* Unused. Silent compiler warning. */
@@ -59,11 +60,11 @@ query_session_ahc (void *cls, struct MHD_Connection *connection,
  }
  if (GNUTLS_TLS1_1 !=
-      (ret = MHD_get_connection_info
+      (gret = MHD_get_connection_info
-               (connection,
+                (connection,
-               MHD_CONNECTION_INFO_PROTOCOL)->protocol))
+                MHD_CONNECTION_INFO_PROTOCOL)->protocol))
  {
-    if (GNUTLS_TLS1_2 == ret)
+    if (GNUTLS_TLS1_2 == gret)
    {
      /* as usual, TLS implementations sometimes don't
         quite do what was asked, just mildly complain... */
@@ -76,8 +77,8 @@ query_session_ahc (void *cls, struct MHD_Connection *connection,
      fprintf (stderr,
               "Error: requested protocol mismatch (wanted %d, got %d)\n",
               GNUTLS_TLS1_1,
-               ret);
+               gret);
-      return -1;
+      return MHD_NO;
    }
  }
diff --git a/src/testcurl/https/tls_test_common.c b/src/testcurl/https/tls_test_common.c
index f68f5979..a704be5f 100644
--- a/src/testcurl/https/tls_test_common.c
+++ b/src/testcurl/https/tls_test_common.c
@@ -176,7 +176,7 @@ copyBuffer (void *ptr,
 /**
 *  HTTP access handler call back
 */
-int
+enum MHD_Result
 http_ahc (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -188,7 +188,7 @@ http_ahc (void *cls,
 {
  static int aptr;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) cls; (void) url; (void) version;            /* Unused. Silent compiler warning. */
  (void) upload_data; (void) upload_data_size;     /* Unused. Silent compiler warning. */
@@ -211,7 +211,7 @@ http_ahc (void *cls,
 /* HTTP access handler call back */
-int
+enum MHD_Result
 http_dummy_ahc (void *cls,
                struct MHD_Connection *connection,
                const char *url,
diff --git a/src/testcurl/https/tls_test_common.h b/src/testcurl/https/tls_test_common.h
index 36f5ffa5..fd2a47b1 100644
--- a/src/testcurl/https/tls_test_common.h
+++ b/src/testcurl/https/tls_test_common.h
@@ -95,12 +95,12 @@ print_test_result (int test_outcome, char *test_name);
 size_t
 copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx);
-int
+enum MHD_Result
 http_ahc (void *cls, struct MHD_Connection *connection,
          const char *url, const char *method, const char *upload_data,
          const char *version, size_t *upload_data_size, void **ptr);
-int
+enum MHD_Result
 http_dummy_ahc (void *cls, struct MHD_Connection *connection,
                const char *url, const char *method, const char *upload_data,
                const char *version, size_t *upload_data_size,
diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c
index 53992b17..eb33ea0c 100644
--- a/src/testcurl/perf_get.c
+++ b/src/testcurl/perf_get.c
@@ -151,7 +151,7 @@ copyBuffer (void *ptr,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -162,7 +162,7 @@ ahc_echo (void *cls,
 {
  static int ptr;
  const char *me = cls;
-  int ret;
+  enum MHD_Result ret;
  (void) url; (void) version;                      /* Unused. Silent compiler warning. */
  (void) upload_data; (void) upload_data_size;     /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/perf_get_concurrent.c b/src/testcurl/perf_get_concurrent.c
index 12c57dae..0471143c 100644
--- a/src/testcurl/perf_get_concurrent.c
+++ b/src/testcurl/perf_get_concurrent.c
@@ -146,7 +146,7 @@ copyBuffer (void *ptr,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -157,7 +157,7 @@ ahc_echo (void *cls,
 {
  static int ptr;
  const char *me = cls;
-  int ret;
+  enum MHD_Result ret;
  (void) url; (void) version;                      /* Unused. Silent compiler warning. */
  (void) upload_data; (void) upload_data_size;     /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_callback.c b/src/testcurl/test_callback.c
index 2e2be470..d9dfecef 100644
--- a/src/testcurl/test_callback.c
+++ b/src/testcurl/test_callback.c
@@ -58,7 +58,7 @@ called_twice (void *cls, uint64_t pos, char *buf, size_t max)
 }
-static int
+static enum MHD_Result
 callback (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -70,7 +70,7 @@ callback (void *cls,
 {
  struct callback_closure *cbc = calloc (1, sizeof(struct callback_closure));
  struct MHD_Response *r;
-  int ret;
+  enum MHD_Result ret;
  (void) cls;
  (void) url;                          /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_concurrent_stop.c b/src/testcurl/test_concurrent_stop.c
index 750fddc8..6716f491 100644
--- a/src/testcurl/test_concurrent_stop.c
+++ b/src/testcurl/test_concurrent_stop.c
@@ -134,7 +134,7 @@ copyBuffer (void *ptr,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -146,7 +146,7 @@ ahc_echo (void *cls,
 {
  static int ptr;
  const char *me = cls;
-  int ret;
+  enum MHD_Result ret;
  (void) url; (void) version;                      /* Unused. Silent compiler warning. */
  (void) upload_data; (void) upload_data_size;     /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_delete.c b/src/testcurl/test_delete.c
index 8854cde7..ae62311b 100644
--- a/src/testcurl/test_delete.c
+++ b/src/testcurl/test_delete.c
@@ -81,7 +81,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -92,7 +92,7 @@ ahc_echo (void *cls,
 {
  int *done = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) version; (void) unused;   /* Unused. Silent compiler warning. */
  if (0 != strcasecmp ("DELETE", method))
diff --git a/src/testcurl/test_digestauth.c b/src/testcurl/test_digestauth.c
index 4de006b7..9b33eb9b 100644
--- a/src/testcurl/test_digestauth.c
+++ b/src/testcurl/test_digestauth.c
@@ -76,7 +76,7 @@ copyBuffer (void *ptr,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -90,7 +90,7 @@ ahc_echo (void *cls,
  char *username;
  const char *password = "testpass";
  const char *realm = "test@example.com";
-  int ret;
+  enum MHD_Result ret;
  (void) cls; (void) url;                          /* Unused. Silent compiler warning. */
  (void) method; (void) version; (void) upload_data; /* Unused. Silent compiler warning. */
  (void) upload_data_size; (void) unused;         /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_digestauth_sha256.c b/src/testcurl/test_digestauth_sha256.c
index 3482d14d..ffeabd0c 100644
--- a/src/testcurl/test_digestauth_sha256.c
+++ b/src/testcurl/test_digestauth_sha256.c
@@ -77,7 +77,7 @@ copyBuffer (void *ptr,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -91,7 +91,7 @@ ahc_echo (void *cls,
  char *username;
  const char *password = "testpass";
  const char *realm = "test@example.com";
-  int ret;
+  enum MHD_Result ret;
  (void) cls; (void) url;                          /* Unused. Silent compiler warning. */
  (void) method; (void) version; (void) upload_data; /* Unused. Silent compiler warning. */
  (void) upload_data_size; (void) unused;         /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_digestauth_with_arguments.c b/src/testcurl/test_digestauth_with_arguments.c
index f1927d1a..70d5f644 100644
--- a/src/testcurl/test_digestauth_with_arguments.c
+++ b/src/testcurl/test_digestauth_with_arguments.c
@@ -71,7 +71,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -84,7 +84,7 @@ ahc_echo (void *cls,
  char *username;
  const char *password = "testpass";
  const char *realm = "test@example.com";
-  int ret;
+  enum MHD_Result ret;
  (void) cls; (void) url;                          /* Unused. Silent compiler warning. */
  (void) method; (void) version; (void) upload_data; /* Unused. Silent compiler warning. */
  (void) upload_data_size; (void) unused;         /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c
index 3ab05d9a..91efdefd 100644
--- a/src/testcurl/test_get.c
+++ b/src/testcurl/test_get.c
@@ -98,7 +98,7 @@ log_cb (void *cls,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -110,7 +110,7 @@ ahc_echo (void *cls,
  static int ptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  const char *v;
  (void) version;
  (void) upload_data;
@@ -714,7 +714,7 @@ testStopRace (int poll_flag)
 }
-static int
+static enum MHD_Result
 ahc_empty (void *cls,
           struct MHD_Connection *connection,
           const char *url,
@@ -726,7 +726,7 @@ ahc_empty (void *cls,
 {
  static int ptr;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) cls;
  (void) url;
  (void) url;
diff --git a/src/testcurl/test_get_chunked.c b/src/testcurl/test_get_chunked.c
index 7be1db60..aa60e2f8 100644
--- a/src/testcurl/test_get_chunked.c
+++ b/src/testcurl/test_get_chunked.c
@@ -106,7 +106,7 @@ crcf (void *ptr)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -118,7 +118,7 @@ ahc_echo (void *cls,
  const char *me = cls;
  struct MHD_Response *response;
  struct MHD_Response **responseptr;
-  int ret;
+  enum MHD_Result ret;
  (void) url;
  (void) version;                      /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_get_response_cleanup.c b/src/testcurl/test_get_response_cleanup.c
index 14c2f240..026fd254 100644
--- a/src/testcurl/test_get_response_cleanup.c
+++ b/src/testcurl/test_get_response_cleanup.c
@@ -116,7 +116,7 @@ push_free_callback (void *cls)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -128,7 +128,7 @@ ahc_echo (void *cls,
  static int ptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) url; (void) version;                      /* Unused. Silent compiler warning. */
  (void) upload_data; (void) upload_data_size;     /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_get_sendfile.c b/src/testcurl/test_get_sendfile.c
index ad102f0b..0095731e 100644
--- a/src/testcurl/test_get_sendfile.c
+++ b/src/testcurl/test_get_sendfile.c
@@ -75,7 +75,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -87,7 +87,7 @@ ahc_echo (void *cls,
  static int ptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  int fd;
  (void) url; (void) version;                      /* Unused. Silent compiler warning. */
  (void) upload_data; (void) upload_data_size;     /* Unused. Silent compiler warning. */
@@ -490,7 +490,7 @@ testExternalGet ()
  if (cbc.pos != strlen (TESTSTR))
  {
    fprintf (stderr,
-             "Got %.*s instead of %S!\n",
+             "Got %.*s instead of %s!\n",
             (int) cbc.pos,
             cbc.buf,
             TESTSTR);
diff --git a/src/testcurl/test_iplimit.c b/src/testcurl/test_iplimit.c
index 60570886..3b61f827 100644
--- a/src/testcurl/test_iplimit.c
+++ b/src/testcurl/test_iplimit.c
@@ -74,7 +74,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -86,7 +86,7 @@ ahc_echo (void *cls,
  static int ptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) version; (void) upload_data; (void) upload_data_size;       /* Unused. Silent compiler warning. */
  if (0 != strcmp (me, method))
diff --git a/src/testcurl/test_large_put.c b/src/testcurl/test_large_put.c
index b52246ef..d93942e4 100644
--- a/src/testcurl/test_large_put.c
+++ b/src/testcurl/test_large_put.c
@@ -118,7 +118,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -129,7 +129,7 @@ ahc_echo (void *cls,
 {
  int *done = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  static size_t processed;
  (void) version;        /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_long_header.c b/src/testcurl/test_long_header.c
index 17d8904b..54030c21 100644
--- a/src/testcurl/test_long_header.c
+++ b/src/testcurl/test_long_header.c
@@ -46,7 +46,7 @@
 static int oneone;
-static int
+static enum MHD_Result
 apc_all (void *cls, const struct sockaddr *addr, socklen_t addrlen)
 {
  (void) cls; (void) addr; (void) addrlen;   /* Unused. Silent compiler warning. */
@@ -69,7 +69,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -80,7 +80,7 @@ ahc_echo (void *cls,
 {
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) version; (void) upload_data;      /* Unused. Silent compiler warning. */
  (void) upload_data_size; (void) unused;  /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_parse_cookies.c b/src/testcurl/test_parse_cookies.c
index d4c291ea..8a786cc2 100644
--- a/src/testcurl/test_parse_cookies.c
+++ b/src/testcurl/test_parse_cookies.c
@@ -59,7 +59,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -71,7 +71,7 @@ ahc_echo (void *cls,
  static int ptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  const char *hdr;
  (void) version; (void) upload_data; (void) upload_data_size;       /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_patch.c b/src/testcurl/test_patch.c
index 86327b0d..6be3ab30 100644
--- a/src/testcurl/test_patch.c
+++ b/src/testcurl/test_patch.c
@@ -81,7 +81,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -92,7 +92,7 @@ ahc_echo (void *cls,
 {
  int *done = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) version; (void) unused;   /* Unused. Silent compiler warning. */
  if (0 != strcasecmp ("PATCH", method))
diff --git a/src/testcurl/test_post.c b/src/testcurl/test_post.c
index 97c9bcc9..675f8db6 100644
--- a/src/testcurl/test_post.c
+++ b/src/testcurl/test_post.c
@@ -97,7 +97,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 * in that it fails to support incremental processing.
 * (to be fixed in the future)
 */
-static int
+static enum MHD_Result
 post_iterator (void *cls,
               enum MHD_ValueKind kind,
               const char *key,
@@ -120,7 +120,7 @@ post_iterator (void *cls,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -132,7 +132,7 @@ ahc_echo (void *cls,
  static int eok;
  struct MHD_Response *response;
  struct MHD_PostProcessor *pp;
-  int ret;
+  enum MHD_Result ret;
  (void) cls; (void) version;      /* Unused. Silent compiler warning. */
  if (0 != strcasecmp ("POST", method))
@@ -562,7 +562,7 @@ testExternalPost ()
 }
-static int
+static enum MHD_Result
 ahc_cancel (void *cls,
            struct MHD_Connection *connection,
            const char *url,
@@ -572,7 +572,7 @@ ahc_cancel (void *cls,
            void **unused)
 {
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) cls; (void) url; (void) version;            /* Unused. Silent compiler warning. */
  (void) upload_data; (void) upload_data_size;     /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_post_loop.c b/src/testcurl/test_post_loop.c
index 38f9de6e..0eaf2730 100644
--- a/src/testcurl/test_post_loop.c
+++ b/src/testcurl/test_post_loop.c
@@ -72,7 +72,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -83,7 +83,7 @@ ahc_echo (void *cls,
 {
  static int marker;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) cls; (void) url; (void) version;            /* Unused. Silent compiler warning. */
  (void) upload_data; (void) upload_data_size;     /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_postform.c b/src/testcurl/test_postform.c
index 25e6d0e4..18a0fc62 100644
--- a/src/testcurl/test_postform.c
+++ b/src/testcurl/test_postform.c
@@ -93,7 +93,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 * in that it fails to support incremental processing.
 * (to be fixed in the future)
 */
-static int
+static enum MHD_Result
 post_iterator (void *cls,
               enum MHD_ValueKind kind,
               const char *key,
@@ -119,7 +119,7 @@ post_iterator (void *cls,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -131,7 +131,7 @@ ahc_echo (void *cls,
  static int eok;
  struct MHD_Response *response;
  struct MHD_PostProcessor *pp;
-  int ret;
+  enum MHD_Result ret;
  (void) cls; (void) version;      /* Unused. Silent compiler warning. */
  if (0 != strcmp ("POST", method))
diff --git a/src/testcurl/test_process_arguments.c b/src/testcurl/test_process_arguments.c
index dc50396d..f7e03531 100644
--- a/src/testcurl/test_process_arguments.c
+++ b/src/testcurl/test_process_arguments.c
@@ -60,7 +60,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -72,7 +72,7 @@ ahc_echo (void *cls,
  static int ptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  const char *hdr;
  (void) version; (void) upload_data; (void) upload_data_size;       /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_process_headers.c b/src/testcurl/test_process_headers.c
index 34200082..5784f5b7 100644
--- a/src/testcurl/test_process_headers.c
+++ b/src/testcurl/test_process_headers.c
@@ -66,7 +66,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 kv_cb (void *cls, enum MHD_ValueKind kind, const char *key, const char *value)
 {
  if ((0 == strcmp (key, MHD_HTTP_HEADER_HOST)) &&
@@ -80,7 +80,7 @@ kv_cb (void *cls, enum MHD_ValueKind kind, const char *key, const char *value)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -92,7 +92,7 @@ ahc_echo (void *cls,
  static int ptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  const char *hdr;
  (void) version; (void) upload_data; (void) upload_data_size;       /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_put.c b/src/testcurl/test_put.c
index 2326310a..c582a418 100644
--- a/src/testcurl/test_put.c
+++ b/src/testcurl/test_put.c
@@ -81,7 +81,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -92,7 +92,7 @@ ahc_echo (void *cls,
 {
  int *done = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) version; (void) unused;   /* Unused. Silent compiler warning. */
  if (0 != strcasecmp ("PUT", method))
diff --git a/src/testcurl/test_put_chunked.c b/src/testcurl/test_put_chunked.c
index 0824b286..e393523d 100644
--- a/src/testcurl/test_put_chunked.c
+++ b/src/testcurl/test_put_chunked.c
@@ -81,7 +81,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -92,7 +92,7 @@ ahc_echo (void *cls,
 {
  int *done = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  int have;
  (void) version; (void) unused;   /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_quiesce.c b/src/testcurl/test_quiesce.c
index 8a79a3c4..ac0ade30 100644
--- a/src/testcurl/test_quiesce.c
+++ b/src/testcurl/test_quiesce.c
@@ -70,7 +70,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -82,7 +82,7 @@ ahc_echo (void *cls,
  static int ptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) version; (void) upload_data; (void) upload_data_size;       /* Unused. Silent compiler warning. */
  if (0 != strcmp (me, method))
diff --git a/src/testcurl/test_quiesce_stream.c b/src/testcurl/test_quiesce_stream.c
index cb1e71cb..5a3e601e 100644
--- a/src/testcurl/test_quiesce_stream.c
+++ b/src/testcurl/test_quiesce_stream.c
@@ -132,7 +132,7 @@ free_crc_data (void *crc_data)
 }
-static int
+static enum MHD_Result
 http_AccessHandlerCallback (void *cls,
                            struct MHD_Connection *connection,
                            const char *url,
@@ -142,7 +142,7 @@ http_AccessHandlerCallback (void *cls,
                            size_t *upload_data_size,
                            void **con_cls)
 {
-  int ret;
+  enum MHD_Result ret;
  (void) cls; (void) url;                          /* Unused. Silent compiler warning. */
  (void) method; (void) version; (void) upload_data; /* Unused. Silent compiler warning. */
  (void) upload_data_size;                       /* Unused. Silent compiler warning. */
diff --git a/src/testcurl/test_termination.c b/src/testcurl/test_termination.c
index 17940020..5541ae30 100644
--- a/src/testcurl/test_termination.c
+++ b/src/testcurl/test_termination.c
@@ -47,7 +47,7 @@
 #include <windows.h>
 #endif
-static int
+static enum MHD_Result
 connection_handler (void *cls,
                    struct MHD_Connection *connection,
                    const char *url,
@@ -76,7 +76,7 @@ connection_handler (void *cls,
  struct MHD_Response *response =
    MHD_create_response_from_buffer (strlen ("Response"), "Response",
                                     MHD_RESPMEM_PERSISTENT);
-  int ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
+  enum MHD_Result ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
  MHD_destroy_response (response);
  return ret;
diff --git a/src/testcurl/test_timeout.c b/src/testcurl/test_timeout.c
index db1c1e6a..018195f4 100644
--- a/src/testcurl/test_timeout.c
+++ b/src/testcurl/test_timeout.c
@@ -121,7 +121,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -132,7 +132,7 @@ ahc_echo (void *cls,
 {
  int *done = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) version; (void) unused;   /* Unused. Silent compiler warning. */
  if (0 != strcmp ("PUT", method))
diff --git a/src/testcurl/test_urlparse.c b/src/testcurl/test_urlparse.c
index e8770330..d089ab22 100644
--- a/src/testcurl/test_urlparse.c
+++ b/src/testcurl/test_urlparse.c
@@ -69,7 +69,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 test_values (void *cls,
             enum MHD_ValueKind kind,
             const char *key,
@@ -89,7 +89,7 @@ test_values (void *cls,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -101,7 +101,7 @@ ahc_echo (void *cls,
  static int ptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) version; (void) upload_data; (void) upload_data_size;       /* Unused. Silent compiler warning. */
  if (0 != strcmp (me, method))
diff --git a/src/testzzuf/test_get.c b/src/testzzuf/test_get.c
index 83d92ab3..9ef0d4f7 100644
--- a/src/testzzuf/test_get.c
+++ b/src/testzzuf/test_get.c
@@ -60,7 +60,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -72,7 +72,7 @@ ahc_echo (void *cls,
  static int ptr;
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) version; (void) upload_data; (void) upload_data_size;       /* Unused. Silent compiler warning. */
  if (0 != strcmp (me, method))
diff --git a/src/testzzuf/test_get_chunked.c b/src/testzzuf/test_get_chunked.c
index 8ad7dd6b..9a6536c0 100644
--- a/src/testzzuf/test_get_chunked.c
+++ b/src/testzzuf/test_get_chunked.c
@@ -89,7 +89,7 @@ crcf (void *ptr)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -101,7 +101,7 @@ ahc_echo (void *cls,
  const char *me = cls;
  struct MHD_Response *response;
  struct MHD_Response **responseptr;
-  int ret;
+  enum MHD_Result ret;
  (void) url;
  (void) version;                      /* Unused. Silent compiler warning. */
diff --git a/src/testzzuf/test_long_header.c b/src/testzzuf/test_long_header.c
index 6595ad4e..add99234 100644
--- a/src/testzzuf/test_long_header.c
+++ b/src/testzzuf/test_long_header.c
@@ -47,7 +47,7 @@
 static int oneone;
-static int
+static enum MHD_Result
 apc_all (void *cls, const struct sockaddr *addr, socklen_t addrlen)
 {
  (void) cls; (void) addr; (void) addrlen;   /* Unused. Silent compiler warning. */
@@ -70,7 +70,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -81,7 +81,7 @@ ahc_echo (void *cls,
 {
  const char *me = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) version; (void) upload_data;      /* Unused. Silent compiler warning. */
  (void) upload_data_size; (void) unused;  /* Unused. Silent compiler warning. */
@@ -128,6 +128,11 @@ testLongUrlGet ()
    c = curl_easy_init ();
    url = malloc (VERY_LONG);
+    if (NULL == url)
+    {
+      zzuf_socat_stop ();
+      return 1;
+    }
    memset (url, 'a', VERY_LONG);
    url[VERY_LONG - 1] = '\0';
    memcpy (url, "http://127.0.0.1:11081/",
@@ -189,6 +194,12 @@ testLongHeaderGet ()
    fprintf (stderr, ".");
    c = curl_easy_init ();
    url = malloc (VERY_LONG);
+    if (NULL == url)
+    {
+      zzuf_socat_stop ();
+      curl_easy_cleanup (c);
+      return 16;
+    }
    memset (url, 'a', VERY_LONG);
    url[VERY_LONG - 1] = '\0';
    url[VERY_LONG / 2] = ':';
diff --git a/src/testzzuf/test_post.c b/src/testzzuf/test_post.c
index 637423c8..e3d8512c 100644
--- a/src/testzzuf/test_post.c
+++ b/src/testzzuf/test_post.c
@@ -84,7 +84,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 * in that it fails to support incremental processing.
 * (to be fixed in the future)
 */
-static int
+static enum MHD_Result
 post_iterator (void *cls,
               enum MHD_ValueKind kind,
               const char *key,
@@ -107,7 +107,7 @@ post_iterator (void *cls,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -119,7 +119,7 @@ ahc_echo (void *cls,
  static int eok;
  struct MHD_Response *response;
  struct MHD_PostProcessor *pp;
-  int ret;
+  enum MHD_Result ret;
  (void) cls; (void) version;      /* Unused. Silent compiler warning. */
  if (0 != strcmp ("POST", method))
diff --git a/src/testzzuf/test_post_form.c b/src/testzzuf/test_post_form.c
index a253b96d..f994ab24 100644
--- a/src/testzzuf/test_post_form.c
+++ b/src/testzzuf/test_post_form.c
@@ -82,7 +82,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 * in that it fails to support incremental processing.
 * (to be fixed in the future)
 */
-static int
+static enum MHD_Result
 post_iterator (void *cls,
               enum MHD_ValueKind kind,
               const char *key,
@@ -110,7 +110,7 @@ post_iterator (void *cls,
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -122,7 +122,7 @@ ahc_echo (void *cls,
  static int eok;
  struct MHD_Response *response;
  struct MHD_PostProcessor *pp;
-  int ret;
+  enum MHD_Result ret;
  (void) cls; (void) version;      /* Unused. Silent compiler warning. */
  if (0 != strcmp ("POST", method))
diff --git a/src/testzzuf/test_put.c b/src/testzzuf/test_put.c
index 2c79c759..4658d0d4 100644
--- a/src/testzzuf/test_put.c
+++ b/src/testzzuf/test_put.c
@@ -76,7 +76,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -87,7 +87,7 @@ ahc_echo (void *cls,
 {
  int *done = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) version; (void) unused;   /* Unused. Silent compiler warning. */
  if (0 != strcmp ("PUT", method))
diff --git a/src/testzzuf/test_put_chunked.c b/src/testzzuf/test_put_chunked.c
index 29108008..35196843 100644
--- a/src/testzzuf/test_put_chunked.c
+++ b/src/testzzuf/test_put_chunked.c
@@ -76,7 +76,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -87,7 +87,7 @@ ahc_echo (void *cls,
 {
  int *done = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  int have;
  (void) version; (void) unused;   /* Unused. Silent compiler warning. */
diff --git a/src/testzzuf/test_put_large.c b/src/testzzuf/test_put_large.c
index 56b076c5..abda22cb 100644
--- a/src/testzzuf/test_put_large.c
+++ b/src/testzzuf/test_put_large.c
@@ -84,7 +84,7 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
-static int
+static enum MHD_Result
 ahc_echo (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -95,7 +95,7 @@ ahc_echo (void *cls,
 {
  int *done = cls;
  struct MHD_Response *response;
-  int ret;
+  enum MHD_Result ret;
  (void) version; (void) unused; /* Unused. Silent compiler warning. */
  if (0 != strcmp ("PUT", method))
@@ -376,6 +376,8 @@ main (int argc, char *const *argv)
  if (0 != curl_global_init (CURL_GLOBAL_WIN32))
    return 2;
  put_buffer = malloc (PUT_SIZE);
+  if (0 == put_buffer)
+    return 77;
  memset (put_buffer, 1, PUT_SIZE);
  if (MHD_YES == MHD_is_feature_supported (MHD_FEATURE_THREADS))
  {