3 files changed, 6 insertions, 1 deletions

diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 0a7e4711..46a82625 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -2310,6 +2310,7 @@ MHD_upgrade_action (struct MHD_UpgradeResponseHandle *urh,
  * @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 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
@@ -2331,6 +2332,7 @@ MHD_upgrade_action (struct MHD_UpgradeResponseHandle *urh,
 typedef void
 (*MHD_UpgradeHandler)(void *cls,
                       struct MHD_Connection *connection,
+                      void *con_cls,
                       const char *extra_in,
                       size_t extra_in_size,
                       MHD_socket sock,
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
index fa45f5f5..9336aa91 100644
--- a/src/microhttpd/response.c
+++ b/src/microhttpd/response.c
@@ -702,6 +702,7 @@ MHD_response_execute_upgrade_ (struct MHD_Response *response,
     connection->read_buffer_offset = 0;
     response->upgrade_handler (response->upgrade_handler_cls,
                                connection,
+                               connection->con_cls,
                                connection->read_buffer,
                                rbo,
                                urh->app_socket,
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index 5251c6bc..2288d927 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -177,6 +177,7 @@ recv_all (MHD_socket sock,
  * @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` in 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
@@ -192,12 +193,13 @@ recv_all (MHD_socket sock,
  *        may not work as expected (as the socket could be from a
  *        socketpair() or a TCP-loopback)
  * @param urh argument for #MHD_upgrade_action()s on this @a connection.
- *        Applications must eventually use this callback to perform the
+ *        Applications must eventually use this function to perform the
  *        close() action on the @a sock.
  */
 static void
 upgrade_cb (void *cls,
             struct MHD_Connection *connection,
+            void *con_cls,
             const char *extra_in,
             size_t extra_in_size,
             MHD_socket sock,