28 files changed, 128 insertions, 128 deletions

diff --git a/src/examples/authorization_example.c b/src/examples/authorization_example.c
index f9500325..e7a099ed 100644
--- a/src/examples/authorization_example.c
+++ b/src/examples/authorization_example.c
@@ -45,7 +45,7 @@ ahc_echo (void *cls,
           const char *url,
           const char *method,
           const char *version,
-          const char *upload_data, size_t *upload_data_size, void **ptr)
+          const char *upload_data, size_t *upload_data_size, void **req_cls)
 {
   static int aptr;
   const char *me = cls;
@@ -61,13 +61,13 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
 
   /* require: "Aladdin" with password "open sesame" */
   pass = NULL;
diff --git a/src/examples/benchmark.c b/src/examples/benchmark.c
index a579d42b..185e3824 100644
--- a/src/examples/benchmark.c
+++ b/src/examples/benchmark.c
@@ -62,7 +62,7 @@ static struct MHD_Response *response;
  *
  * @param cls client-defined closure
  * @param connection connection handle
- * @param con_cls value as set by the last call to
+ * @param req_cls value as set by the last call to
  *        the MHD_AccessHandlerCallback
  * @param toe reason for request termination
  * @see MHD_OPTION_NOTIFY_COMPLETED
@@ -70,10 +70,10 @@ static struct MHD_Response *response;
 static void
 completed_callback (void *cls,
                     struct MHD_Connection *connection,
-                    void **con_cls,
+                    void **req_cls,
                     enum MHD_RequestTerminationCode toe)
 {
-  struct timeval *tv = *con_cls;
+  struct timeval *tv = *req_cls;
   struct timeval tve;
   uint64_t delta;
   (void) cls;         /* Unused. Silent compiler warning. */
@@ -119,14 +119,14 @@ ahc_echo (void *cls,
           const char *url,
           const char *method,
           const char *version,
-          const char *upload_data, size_t *upload_data_size, void **ptr)
+          const char *upload_data, size_t *upload_data_size, void **req_cls)
 {
   (void) cls;               /* Unused. Silent compiler warning. */
   (void) url;               /* Unused. Silent compiler warning. */
   (void) version;           /* Unused. Silent compiler warning. */
   (void) upload_data;       /* Unused. Silent compiler warning. */
   (void) upload_data_size;  /* Unused. Silent compiler warning. */
-  (void) ptr;               /* Unused. Silent compiler warning. */
+  (void) req_cls;           /* Unused. Silent compiler warning. */
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO;              /* unexpected method */
diff --git a/src/examples/benchmark_https.c b/src/examples/benchmark_https.c
index ddc3be19..36a46aa8 100644
--- a/src/examples/benchmark_https.c
+++ b/src/examples/benchmark_https.c
@@ -62,7 +62,7 @@ static struct MHD_Response *response;
  *
  * @param cls client-defined closure
  * @param connection connection handle
- * @param con_cls value as set by the last call to
+ * @param req_cls value as set by the last call to
  *        the MHD_AccessHandlerCallback
  * @param toe reason for request termination
  * @see MHD_OPTION_NOTIFY_COMPLETED
@@ -70,10 +70,10 @@ static struct MHD_Response *response;
 static void
 completed_callback (void *cls,
                     struct MHD_Connection *connection,
-                    void **con_cls,
+                    void **req_cls,
                     enum MHD_RequestTerminationCode toe)
 {
-  struct timeval *tv = *con_cls;
+  struct timeval *tv = *req_cls;
   struct timeval tve;
   uint64_t delta;
   (void) cls;         /* Unused. Silent compiler warning. */
@@ -119,14 +119,14 @@ ahc_echo (void *cls,
           const char *url,
           const char *method,
           const char *version,
-          const char *upload_data, size_t *upload_data_size, void **ptr)
+          const char *upload_data, size_t *upload_data_size, void **req_cls)
 {
   (void) cls;               /* Unused. Silent compiler warning. */
   (void) url;               /* Unused. Silent compiler warning. */
   (void) version;           /* Unused. Silent compiler warning. */
   (void) upload_data;       /* Unused. Silent compiler warning. */
   (void) upload_data_size;  /* Unused. Silent compiler warning. */
-  (void) ptr;               /* Unused. Silent compiler warning. */
+  (void) req_cls;           /* Unused. Silent compiler warning. */
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO;              /* unexpected method */
diff --git a/src/examples/chunked_example.c b/src/examples/chunked_example.c
index 68b7ea1e..5a4c0ced 100644
--- a/src/examples/chunked_example.c
+++ b/src/examples/chunked_example.c
@@ -97,7 +97,7 @@ ahc_echo (void *cls,
           const char *version,
           const char *upload_data,
           size_t *upload_data_size,
-          void **ptr)
+          void **req_cls)
 {
   static int aptr;
   struct ResponseContentCallbackParam *callback_param;
@@ -111,10 +111,10 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
 
@@ -126,7 +126,7 @@ ahc_echo (void *cls,
   callback_param->response_size = (sizeof(simple_response_text)
                                    / sizeof(char)) - 1;
 
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
   response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN,
                                                 1024,
                                                 &callback,
diff --git a/src/examples/connection_close.c b/src/examples/connection_close.c
index 5629a687..e5f787a3 100644
--- a/src/examples/connection_close.c
+++ b/src/examples/connection_close.c
@@ -41,7 +41,7 @@ ahc_echo (void *cls,
           const char *url,
           const char *method,
           const char *version,
-          const char *upload_data, size_t *upload_data_size, void **ptr)
+          const char *upload_data, size_t *upload_data_size, void **req_cls)
 {
   static int aptr;
   const char *me = cls;
@@ -54,13 +54,13 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
   response = MHD_create_response_from_buffer (strlen (me),
                                               (void *) me,
                                               MHD_RESPMEM_PERSISTENT);
@@ -75,7 +75,7 @@ ahc_echo (void *cls,
 static void
 request_completed (void *cls,
                    struct MHD_Connection *connection,
-                   void **con_cls,
+                   void **req_cls,
                    enum MHD_RequestTerminationCode toe)
 {
   fprintf (stderr,
diff --git a/src/examples/demo.c b/src/examples/demo.c
index 0b6dc5f9..6ff7adae 100644
--- a/src/examples/demo.c
+++ b/src/examples/demo.c
@@ -619,7 +619,7 @@ process_upload_data (void *cls,
  *
  * @param cls client-defined closure, NULL
  * @param connection connection handle
- * @param con_cls value as set by the last call to
+ * @param req_cls value as set by the last call to
  *        the MHD_AccessHandlerCallback, points to NULL if this was
  *            not an upload
  * @param toe reason for request termination
@@ -627,10 +627,10 @@ process_upload_data (void *cls,
 static void
 response_completed_callback (void *cls,
                              struct MHD_Connection *connection,
-                             void **con_cls,
+                             void **req_cls,
                              enum MHD_RequestTerminationCode toe)
 {
-  struct UploadContext *uc = *con_cls;
+  struct UploadContext *uc = *req_cls;
   (void) cls;         /* Unused. Silent compiler warning. */
   (void) connection;  /* Unused. Silent compiler warning. */
   (void) toe;         /* Unused. Silent compiler warning. */
@@ -694,7 +694,7 @@ return_directory_response (struct MHD_Connection *connection)
  * @param version HTTP version
  * @param upload_data data from upload (PUT/POST)
  * @param upload_data_size number of bytes in @a upload_data
- * @param ptr our context
+ * @param req_cls our context
  * @return #MHD_YES on success, #MHD_NO to drop connection
  */
 static enum MHD_Result
@@ -704,7 +704,7 @@ generate_page (void *cls,
                const char *method,
                const char *version,
                const char *upload_data,
-               size_t *upload_data_size, void **ptr)
+               size_t *upload_data_size, void **req_cls)
 {
   struct MHD_Response *response;
   enum MHD_Result ret;
@@ -775,7 +775,7 @@ generate_page (void *cls,
   if (0 == strcmp (method, MHD_HTTP_METHOD_POST))
   {
     /* upload! */
-    struct UploadContext *uc = *ptr;
+    struct UploadContext *uc = *req_cls;
 
     if (NULL == uc)
     {
@@ -793,7 +793,7 @@ generate_page (void *cls,
         free (uc);
         return MHD_NO;
       }
-      *ptr = uc;
+      *req_cls = uc;
       return MHD_YES;
     }
     if (0 != *upload_data_size)
diff --git a/src/examples/demo_https.c b/src/examples/demo_https.c
index d4e1d77f..ef59e7d9 100644
--- a/src/examples/demo_https.c
+++ b/src/examples/demo_https.c
@@ -621,7 +621,7 @@ process_upload_data (void *cls,
  *
  * @param cls client-defined closure, NULL
  * @param connection connection handle
- * @param con_cls value as set by the last call to
+ * @param req_cls value as set by the last call to
  *        the MHD_AccessHandlerCallback, points to NULL if this was
  *            not an upload
  * @param toe reason for request termination
@@ -629,10 +629,10 @@ process_upload_data (void *cls,
 static void
 response_completed_callback (void *cls,
                              struct MHD_Connection *connection,
-                             void **con_cls,
+                             void **req_cls,
                              enum MHD_RequestTerminationCode toe)
 {
-  struct UploadContext *uc = *con_cls;
+  struct UploadContext *uc = *req_cls;
   (void) cls;         /* Unused. Silent compiler warning. */
   (void) connection;  /* Unused. Silent compiler warning. */
   (void) toe;         /* Unused. Silent compiler warning. */
@@ -696,7 +696,7 @@ return_directory_response (struct MHD_Connection *connection)
  * @param version HTTP version
  * @param upload_data data from upload (PUT/POST)
  * @param upload_data_size number of bytes in "upload_data"
- * @param ptr our context
+ * @param req_cls our context
  * @return #MHD_YES on success, #MHD_NO to drop connection
  */
 static enum MHD_Result
@@ -706,7 +706,7 @@ generate_page (void *cls,
                const char *method,
                const char *version,
                const char *upload_data,
-               size_t *upload_data_size, void **ptr)
+               size_t *upload_data_size, void **req_cls)
 {
   struct MHD_Response *response;
   enum MHD_Result ret;
@@ -776,7 +776,7 @@ generate_page (void *cls,
   if (0 == strcmp (method, MHD_HTTP_METHOD_POST))
   {
     /* upload! */
-    struct UploadContext *uc = *ptr;
+    struct UploadContext *uc = *req_cls;
 
     if (NULL == uc)
     {
@@ -794,7 +794,7 @@ generate_page (void *cls,
         free (uc);
         return MHD_NO;
       }
-      *ptr = uc;
+      *req_cls = uc;
       return MHD_YES;
     }
     if (0 != *upload_data_size)
diff --git a/src/examples/digest_auth_example.c b/src/examples/digest_auth_example.c
index 073726ad..44faefeb 100644
--- a/src/examples/digest_auth_example.c
+++ b/src/examples/digest_auth_example.c
@@ -40,7 +40,7 @@ ahc_echo (void *cls,
           const char *url,
           const char *method,
           const char *version,
-          const char *upload_data, size_t *upload_data_size, void **ptr)
+          const char *upload_data, size_t *upload_data_size, void **req_cls)
 {
   struct MHD_Response *response;
   char *username;
@@ -54,7 +54,7 @@ ahc_echo (void *cls,
   (void) version;           /* Unused. Silent compiler warning. */
   (void) upload_data;       /* Unused. Silent compiler warning. */
   (void) upload_data_size;  /* Unused. Silent compiler warning. */
-  (void) ptr;               /* Unused. Silent compiler warning. */
+  (void) req_cls;           /* Unused. Silent compiler warning. */
 
   username = MHD_digest_auth_get_username (connection);
   if (NULL == username)
diff --git a/src/examples/dual_stack_example.c b/src/examples/dual_stack_example.c
index 15bafc44..175583ac 100644
--- a/src/examples/dual_stack_example.c
+++ b/src/examples/dual_stack_example.c
@@ -34,7 +34,7 @@ ahc_echo (void *cls,
           const char *url,
           const char *method,
           const char *version,
-          const char *upload_data, size_t *upload_data_size, void **ptr)
+          const char *upload_data, size_t *upload_data_size, void **req_cls)
 {
   static int aptr;
   const char *me = cls;
@@ -47,13 +47,13 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
   response = MHD_create_response_from_buffer (strlen (me),
                                               (void *) me,
                                               MHD_RESPMEM_PERSISTENT);
diff --git a/src/examples/fileserver_example.c b/src/examples/fileserver_example.c
index 94c2ca95..76879eec 100644
--- a/src/examples/fileserver_example.c
+++ b/src/examples/fileserver_example.c
@@ -48,7 +48,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data,
-          size_t *upload_data_size, void **ptr)
+          size_t *upload_data_size, void **req_cls)
 {
   static int aptr;
   struct MHD_Response *response;
@@ -63,13 +63,13 @@ ahc_echo (void *cls,
   if ( (0 != strcmp (method, MHD_HTTP_METHOD_GET)) &&
        (0 != strcmp (method, MHD_HTTP_METHOD_HEAD)) )
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                     /* reset when done */
+  *req_cls = NULL;                 /* reset when done */
   /* WARNING: direct usage of url as filename is for example only!
    * NEVER pass received data directly as parameter to file manipulation
    * functions. Always check validity of data before using.
diff --git a/src/examples/fileserver_example_dirs.c b/src/examples/fileserver_example_dirs.c
index e6c9ed1f..796cb42e 100644
--- a/src/examples/fileserver_example_dirs.c
+++ b/src/examples/fileserver_example_dirs.c
@@ -88,7 +88,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data,
-          size_t *upload_data_size, void **ptr)
+          size_t *upload_data_size, void **req_cls)
 {
   static int aptr;
   struct MHD_Response *response;
@@ -105,13 +105,13 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
 
   file = fopen (&url[1], "rb");
   if (NULL != file)
diff --git a/src/examples/fileserver_example_external_select.c b/src/examples/fileserver_example_external_select.c
index 7209751f..09f7be0a 100644
--- a/src/examples/fileserver_example_external_select.c
+++ b/src/examples/fileserver_example_external_select.c
@@ -55,7 +55,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data,
-          size_t *upload_data_size, void **ptr)
+          size_t *upload_data_size, void **req_cls)
 {
   static int aptr;
   struct MHD_Response *response;
@@ -70,13 +70,13 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
 
   file = fopen (&url[1], "rb");
   if (NULL != file)
diff --git a/src/examples/http_chunked_compression.c b/src/examples/http_chunked_compression.c
index f6baf0fd..7b8ed1fc 100644
--- a/src/examples/http_chunked_compression.c
+++ b/src/examples/http_chunked_compression.c
@@ -156,7 +156,7 @@ free_cb (void *cls)
 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)
+          const char *upload_data, size_t *upload_size, void **req_cls)
 {
   struct Holder *holder;
   struct MHD_Response *res;
@@ -167,12 +167,12 @@ ahc_echo (void *cls, struct MHD_Connection *con, const char *url, const
   (void) version;
   (void) upload_data;
   (void) upload_size;
-  if (NULL == *ptr)
+  if (NULL == *req_cls)
   {
-    *ptr = (void *) 1;
+    *req_cls = (void *) 1;
     return MHD_YES;
   }
-  *ptr = NULL;
+  *req_cls = NULL;
   holder = calloc (1, sizeof (struct Holder));
   if (! holder)
     return MHD_NO;
diff --git a/src/examples/http_compression.c b/src/examples/http_compression.c
index 0419a803..a91a39a3 100644
--- a/src/examples/http_compression.c
+++ b/src/examples/http_compression.c
@@ -96,7 +96,7 @@ ahc_echo (void *cls,
           const char *url,
           const char *method,
           const char *version,
-          const char *upload_data, size_t *upload_data_size, void **ptr)
+          const char *upload_data, size_t *upload_data_size, void **req_cls)
 {
   struct MHD_Response *response;
   enum MHD_Result ret;
@@ -111,12 +111,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO; /* unexpected method */
-  if (! *ptr)
+  if (! *req_cls)
   {
-    *ptr = (void *) 1;
+    *req_cls = (void *) 1;
     return MHD_YES;
   }
-  *ptr = NULL;
+  *req_cls = NULL;
 
   body_str = strdup (PAGE);
   if (NULL == body_str)
diff --git a/src/examples/https_fileserver_example.c b/src/examples/https_fileserver_example.c
index babad604..5dc340f7 100644
--- a/src/examples/https_fileserver_example.c
+++ b/src/examples/https_fileserver_example.c
@@ -137,7 +137,7 @@ http_ahc (void *cls,
           const char *method,
           const char *version,
           const char *upload_data,
-          size_t *upload_data_size, void **ptr)
+          size_t *upload_data_size, void **req_cls)
 {
   static int aptr;
   struct MHD_Response *response;
@@ -152,13 +152,13 @@ http_ahc (void *cls,
 
   if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
 
   file = fopen (&url[1], "rb");
   if (NULL != file)
diff --git a/src/examples/minimal_example.c b/src/examples/minimal_example.c
index a02b5d50..ce604555 100644
--- a/src/examples/minimal_example.c
+++ b/src/examples/minimal_example.c
@@ -36,7 +36,7 @@ ahc_echo (void *cls,
           const char *version,
           const char *upload_data,
           size_t *upload_data_size,
-          void **ptr)
+          void **req_cls)
 {
   static int aptr;
   const char *me = cls;
@@ -50,13 +50,13 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
   response = MHD_create_response_from_buffer (strlen (me),
                                               (void *) me,
                                               MHD_RESPMEM_PERSISTENT);
diff --git a/src/examples/minimal_example_comet.c b/src/examples/minimal_example_comet.c
index c36bf2ce..a8864d89 100644
--- a/src/examples/minimal_example_comet.c
+++ b/src/examples/minimal_example_comet.c
@@ -44,7 +44,7 @@ ahc_echo (void *cls,
           const char *url,
           const char *method,
           const char *version,
-          const char *upload_data, size_t *upload_data_size, void **ptr)
+          const char *upload_data, size_t *upload_data_size, void **req_cls)
 {
   static int aptr;
   struct MHD_Response *response;
@@ -57,13 +57,13 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
   response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN,
                                                 80,
                                                 &data_generator, NULL, NULL);
diff --git a/src/examples/minimal_example_empty.c b/src/examples/minimal_example_empty.c
index d692e0d8..43719a24 100644
--- a/src/examples/minimal_example_empty.c
+++ b/src/examples/minimal_example_empty.c
@@ -34,7 +34,7 @@ ahc_echo (void *cls,
           const char *version,
           const char *upload_data,
           size_t *upload_data_size,
-          void **ptr)
+          void **req_cls)
 {
   static int aptr;
   struct MHD_Response *response;
@@ -48,13 +48,13 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
   response = MHD_create_response_from_buffer (0,
                                               NULL,
                                               MHD_RESPMEM_PERSISTENT);
diff --git a/src/examples/minimal_example_empty_tls.c b/src/examples/minimal_example_empty_tls.c
index 70d7bd71..f03884c8 100644
--- a/src/examples/minimal_example_empty_tls.c
+++ b/src/examples/minimal_example_empty_tls.c
@@ -34,7 +34,7 @@ ahc_echo (void *cls,
           const char *version,
           const char *upload_data,
           size_t *upload_data_size,
-          void **ptr)
+          void **req_cls)
 {
   static int aptr;
   struct MHD_Response *response;
@@ -48,13 +48,13 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
   response = MHD_create_response_from_buffer (0,
                                               NULL,
                                               MHD_RESPMEM_PERSISTENT);
diff --git a/src/examples/msgs_i18n.c b/src/examples/msgs_i18n.c
index 56f9f501..5d563e4f 100644
--- a/src/examples/msgs_i18n.c
+++ b/src/examples/msgs_i18n.c
@@ -51,7 +51,7 @@ ahc_echo (void *cls,
           const char *ver,
           const char *upd,
           size_t *upsz,
-          void **ptr)
+          void **req_cls)
 {
   return MHD_NO;
 }
diff --git a/src/examples/post_example.c b/src/examples/post_example.c
index 9f4fbcf9..d8f58d49 100644
--- a/src/examples/post_example.c
+++ b/src/examples/post_example.c
@@ -540,7 +540,7 @@ post_iterator (void *cls,
  * @param upload_data_size set initially to the size of the
  *        upload_data provided; the method must update this
  *        value to the number of bytes NOT processed;
- * @param ptr pointer that the callback can set to some
+ * @param req_cls pointer that the callback can set to some
  *        address and that will be preserved by MHD for future
  *        calls for this request; since the access handler may
  *        be called many times (i.e., for a PUT/POST operation
@@ -549,7 +549,7 @@ post_iterator (void *cls,
  *        If necessary, this state can be cleaned up in the
  *        global "MHD_RequestCompleted" callback (which
  *        can be set with the MHD_OPTION_NOTIFY_COMPLETED).
- *        Initially, <tt>*con_cls</tt> will be NULL.
+ *        Initially, <tt>*req_cls</tt> will be NULL.
  * @return MHS_YES if the connection was handled successfully,
  *         MHS_NO if the socket must be closed due to a serious
  *         error while handling the request
@@ -562,7 +562,7 @@ create_response (void *cls,
                  const char *version,
                  const char *upload_data,
                  size_t *upload_data_size,
-                 void **ptr)
+                 void **req_cls)
 {
   struct MHD_Response *response;
   struct Request *request;
@@ -572,7 +572,7 @@ create_response (void *cls,
   (void) cls;               /* Unused. Silent compiler warning. */
   (void) version;           /* Unused. Silent compiler warning. */
 
-  request = *ptr;
+  request = *req_cls;
   if (NULL == request)
   {
     request = calloc (1, sizeof (struct Request));
@@ -581,7 +581,7 @@ create_response (void *cls,
       fprintf (stderr, "calloc error: %s\n", strerror (errno));
       return MHD_NO;
     }
-    *ptr = request;
+    *req_cls = request;
     if (0 == strcmp (method, MHD_HTTP_METHOD_POST))
     {
       request->pp = MHD_create_post_processor (connection, 1024,
@@ -660,16 +660,16 @@ create_response (void *cls,
  *
  * @param cls not used
  * @param connection connection that completed
- * @param con_cls session handle
+ * @param req_cls session handle
  * @param toe status code
  */
 static void
 request_completed_callback (void *cls,
                             struct MHD_Connection *connection,
-                            void **con_cls,
+                            void **req_cls,
                             enum MHD_RequestTerminationCode toe)
 {
-  struct Request *request = *con_cls;
+  struct Request *request = *req_cls;
   (void) cls;         /* Unused. Silent compiler warning. */
   (void) connection;  /* Unused. Silent compiler warning. */
   (void) toe;         /* Unused. Silent compiler warning. */
diff --git a/src/examples/querystring_example.c b/src/examples/querystring_example.c
index 975d17f2..d33767cb 100644
--- a/src/examples/querystring_example.c
+++ b/src/examples/querystring_example.c
@@ -35,7 +35,7 @@ ahc_echo (void *cls,
           const char *url,
           const char *method,
           const char *version,
-          const char *upload_data, size_t *upload_data_size, void **ptr)
+          const char *upload_data, size_t *upload_data_size, void **req_cls)
 {
   static int aptr;
   const char *fmt = cls;
@@ -51,13 +51,13 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;      /* reset when done */
+  *req_cls = NULL;  /* reset when done */
   if (NULL == fmt)
     return MHD_NO;  /* The cls must not be NULL */
   val = MHD_lookup_connection_value (connection, MHD_GET_ARGUMENT_KIND, "q");
diff --git a/src/examples/refuse_post_example.c b/src/examples/refuse_post_example.c
index 7e100d9f..dc261575 100644
--- a/src/examples/refuse_post_example.c
+++ b/src/examples/refuse_post_example.c
@@ -41,7 +41,7 @@ ahc_echo (void *cls,
           const char *url,
           const char *method,
           const char *version,
-          const char *upload_data, size_t *upload_data_size, void **ptr)
+          const char *upload_data, size_t *upload_data_size, void **req_cls)
 {
   static int aptr;
   const char *me = cls;
@@ -56,9 +56,9 @@ ahc_echo (void *cls,
   if ((0 != strcmp (method, "GET")) && (0 != strcmp (method, "POST")))
     return MHD_NO;              /* unexpected method */
 
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
-    *ptr = &aptr;
+    *req_cls = &aptr;
 
     /* always to busy for POST requests */
     if (0 == strcmp (method, "POST"))
@@ -74,7 +74,7 @@ ahc_echo (void *cls,
     }
   }
 
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
   response = MHD_create_response_from_buffer (strlen (me),
                                               (void *) me,
                                               MHD_RESPMEM_PERSISTENT);
diff --git a/src/examples/suspend_resume_epoll.c b/src/examples/suspend_resume_epoll.c
index d25c3b21..6b660b00 100644
--- a/src/examples/suspend_resume_epoll.c
+++ b/src/examples/suspend_resume_epoll.c
@@ -49,7 +49,7 @@ ahc_echo (void *cls,
           const char *url,
           const char *method,
           const char *version,
-          const char *upload_data, size_t *upload_data_size, void **ptr)
+          const char *upload_data, size_t *upload_data_size, void **req_cls)
 {
   struct MHD_Response *response;
   enum MHD_Result ret;
@@ -62,7 +62,7 @@ ahc_echo (void *cls,
   (void) version;           /* Unused. Silence compiler warning. */
   (void) upload_data;       /* Unused. Silence compiler warning. */
   (void) upload_data_size;  /* Unused. Silence compiler warning. */
-  req = *ptr;
+  req = *req_cls;
   if (NULL == req)
   {
 
@@ -71,7 +71,7 @@ ahc_echo (void *cls,
       return MHD_NO;
     req->connection = connection;
     req->timerfd = -1;
-    *ptr = req;
+    *req_cls = req;
     return MHD_YES;
   }
 
@@ -120,10 +120,10 @@ ahc_echo (void *cls,
 static void
 connection_done (void *cls,
                  struct MHD_Connection *connection,
-                 void **con_cls,
+                 void **req_cls,
                  enum MHD_RequestTerminationCode toe)
 {
-  struct Request *req = *con_cls;
+  struct Request *req = *req_cls;
 
   (void) cls;
   (void) connection;
diff --git a/src/examples/timeout.c b/src/examples/timeout.c
index b31ff21f..b52f508f 100644
--- a/src/examples/timeout.c
+++ b/src/examples/timeout.c
@@ -37,7 +37,7 @@ answer_to_connection (void *cls,
                       const char *version,
                       const char *upload_data,
                       size_t *upload_data_size,
-                      void **con_cls)
+                      void **req_cls)
 {
   const char *page = "<html><body>Hello timeout!</body></html>";
   struct MHD_Response *response;
@@ -48,7 +48,7 @@ answer_to_connection (void *cls,
   (void) method;            /* Unused. Silent compiler warning. */
   (void) upload_data;       /* Unused. Silent compiler warning. */
   (void) upload_data_size;  /* Unused. Silent compiler warning. */
-  (void) con_cls;           /* Unused. Silent compiler warning. */
+  (void) req_cls;           /* Unused. Silent compiler warning. */
 
   response = MHD_create_response_from_buffer (strlen (page),
                                               (void *) page,
diff --git a/src/examples/upgrade_example.c b/src/examples/upgrade_example.c
index 08c718d0..547f1b6c 100644
--- a/src/examples/upgrade_example.c
+++ b/src/examples/upgrade_example.c
@@ -169,7 +169,7 @@ run_usock (void *cls)
  * @param connection original HTTP connection handle,
  *                   giving the function a last chance
  *                   to inspect the original HTTP request
- * @param con_cls last value left in `con_cls` of the `MHD_AccessHandlerCallback`
+ * @param req_cls last value left in `req_cls` of the `MHD_AccessHandlerCallback`
  * @param extra_in if we happened to have read bytes after the
  *                 HTTP header already (because the client sent
  *                 more than the HTTP header of the request before
@@ -194,7 +194,7 @@ run_usock (void *cls)
 static void
 uh_cb (void *cls,
        struct MHD_Connection *connection,
-       void *con_cls,
+       void *req_cls,
        const char *extra_in,
        size_t extra_in_size,
        MHD_socket sock,
@@ -204,7 +204,7 @@ uh_cb (void *cls,
   pthread_t pt;
   (void) cls;         /* Unused. Silent compiler warning. */
   (void) connection;  /* Unused. Silent compiler warning. */
-  (void) con_cls;     /* Unused. Silent compiler warning. */
+  (void) req_cls;     /* Unused. Silent compiler warning. */
 
   md = malloc (sizeof (struct MyData));
   if (NULL == md)
@@ -247,7 +247,7 @@ ahc_echo (void *cls,
           const char *version,
           const char *upload_data,
           size_t *upload_data_size,
-          void **ptr)
+          void **req_cls)
 {
   static int aptr;
   struct MHD_Response *response;
@@ -260,13 +260,13 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
   response = MHD_create_response_for_upgrade (&uh_cb,
                                               NULL);
 
diff --git a/src/examples/websocket_chatserver_example.c b/src/examples/websocket_chatserver_example.c
index 0c39d5f0..052b4221 100644
--- a/src/examples/websocket_chatserver_example.c
+++ b/src/examples/websocket_chatserver_example.c
@@ -2044,7 +2044,7 @@ connecteduser_receive_messages (void *cls)
  * @param connection original HTTP connection handle,
  *                   giving the function a last chance
  *                   to inspect the original HTTP request
- * @param con_cls last value left in `con_cls` of the `MHD_AccessHandlerCallback`
+ * @param req_cls last value left in `req_cls` of the `MHD_AccessHandlerCallback`
  * @param extra_in if we happened to have read bytes after the
  *                 HTTP header already (because the client sent
  *                 more than the HTTP header of the request before
@@ -2069,7 +2069,7 @@ connecteduser_receive_messages (void *cls)
 static void
 upgrade_handler (void *cls,
                  struct MHD_Connection *connection,
-                 void *con_cls,
+                 void *req_cls,
                  const char *extra_in,
                  size_t extra_in_size,
                  MHD_socket fd,
@@ -2079,7 +2079,7 @@ upgrade_handler (void *cls,
   pthread_t pt;
   (void) cls;         /* Unused. Silent compiler warning. */
   (void) connection;  /* Unused. Silent compiler warning. */
-  (void) con_cls;     /* Unused. Silent compiler warning. */
+  (void) req_cls;     /* Unused. Silent compiler warning. */
 
   /* This callback must return as soon as possible. */
 
@@ -2130,7 +2130,7 @@ upgrade_handler (void *cls,
  * @param version The HTTP version
  * @param upload_data Given upload data for POST requests
  * @param upload_data_size The size of the upload data
- * @param ptr A pointer for request specific data
+ * @param req_cls A pointer for request specific data
  * @return MHD_YES on success or MHD_NO on error.
  */
 static enum MHD_Result
@@ -2141,7 +2141,7 @@ access_handler (void *cls,
                 const char *version,
                 const char *upload_data,
                 size_t *upload_data_size,
-                void **ptr)
+                void **req_cls)
 {
   static int aptr;
   struct MHD_Response *response;
@@ -2153,13 +2153,13 @@ access_handler (void *cls,
 
   if (0 != strcmp (method, "GET"))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
   if (0 == strcmp (url, "/"))
   {
     /* Default page for visiting the server */
diff --git a/src/examples/websocket_threaded_example.c b/src/examples/websocket_threaded_example.c
index b3c7f111..04b972d4 100644
--- a/src/examples/websocket_threaded_example.c
+++ b/src/examples/websocket_threaded_example.c
@@ -763,7 +763,7 @@ run_usock (void *cls)
 
 
 static void
-uh_cb (void *cls, struct MHD_Connection *con, void *con_cls,
+uh_cb (void *cls, struct MHD_Connection *con, void *req_cls,
        const char *extra_in, size_t extra_in_size, MHD_socket sock,
        struct MHD_UpgradeResponseHandle *urh)
 {
@@ -774,7 +774,7 @@ uh_cb (void *cls, struct MHD_Connection *con, void *con_cls,
 
   (void) cls;            /* Unused. Silent compiler warning. */
   (void) con;            /* Unused. Silent compiler warning. */
-  (void) con_cls;        /* Unused. Silent compiler warning. */
+  (void) req_cls;        /* Unused. Silent compiler warning. */
   (void) extra_in;       /* Unused. Silent compiler warning. */
   (void) extra_in_size;  /* Unused. Silent compiler warning. */
 
@@ -814,7 +814,7 @@ uh_cb (void *cls, struct MHD_Connection *con, void *con_cls,
 static enum MHD_Result
 ahc_cb (void *cls, struct MHD_Connection *con, const char *url,
         const char *method, const char *version, const char *upload_data,
-        size_t *upload_data_size, void **ptr)
+        size_t *upload_data_size, void **req_cls)
 {
   struct MHD_Response *res;
   const char *upg_header;
@@ -830,12 +830,12 @@ ahc_cb (void *cls, struct MHD_Connection *con, const char *url,
   (void) upload_data;       /* Unused. Silent compiler warning. */
   (void) upload_data_size;  /* Unused. Silent compiler warning. */
 
-  if (NULL == *ptr)
+  if (NULL == *req_cls)
   {
-    *ptr = (void *) 1;
+    *req_cls = (void *) 1;
     return MHD_YES;
   }
-  *ptr = NULL;
+  *req_cls = NULL;
   upg_header = MHD_lookup_connection_value (con, MHD_HEADER_KIND,
                                             MHD_HTTP_HEADER_UPGRADE);
   con_header = MHD_lookup_connection_value (con, MHD_HEADER_KIND,