4 files changed, 24 insertions, 24 deletions

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 484df542..c120e3a0 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2743,6 +2743,26 @@ MHD_select_thread (void *cls)
 
 
 /**
+ * Process escape sequences ('%HH') Updates val in place; the
+ * result should be UTF-8 encoded and cannot be larger than the input.
+ * The result must also still be 0-terminated.
+ *
+ * @param cls closure (use NULL)
+ * @param connection handle to connection, not used
+ * @param val value to unescape (modified in the process)
+ * @return length of the resulting val (strlen(val) maybe
+ *  shorter afterwards due to elimination of escape sequences)
+ */
+static size_t
+unescape_wrapper (void *cls,
+                  struct MHD_Connection *connection,
+                  char *val)
+{
+  return MHD_http_unescape (val);
+}
+
+
+/**
  * Start a webserver on the given port.  Variadic version of
  * #MHD_start_daemon_va.
  *
@@ -3410,7 +3430,7 @@ MHD_start_daemon_va (unsigned int flags,
   daemon->connection_limit = MHD_MAX_CONNECTIONS_DEFAULT;
   daemon->pool_size = MHD_POOL_SIZE_DEFAULT;
   daemon->pool_increment = MHD_BUF_INC_SIZE;
-  daemon->unescape_callback = &MHD_http_unescape;
+  daemon->unescape_callback = &unescape_wrapper;
   daemon->connection_timeout = 0;       /* no timeout */
   daemon->wpipe[0] = MHD_INVALID_PIPE_;
   daemon->wpipe[1] = MHD_INVALID_PIPE_;
diff --git a/src/microhttpd/internal.c b/src/microhttpd/internal.c
index 37ba1471..5039c32d 100644
--- a/src/microhttpd/internal.c
+++ b/src/microhttpd/internal.c
@@ -124,16 +124,12 @@ MHD_unescape_plus (char *arg)
  * result should be UTF-8 encoded and cannot be larger than the input.
  * The result must also still be 0-terminated.
  *
- * @param cls closure (use NULL)
- * @param connection handle to connection, not used
  * @param val value to unescape (modified in the process)
  * @return length of the resulting val (strlen(val) maybe
  *  shorter afterwards due to elimination of escape sequences)
  */
 size_t
-MHD_http_unescape (void *cls,
-                   struct MHD_Connection *connection,
-                   char *val)
+MHD_http_unescape (char *val)
 {
   char *rpos = val;
   char *wpos = val;
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index 4b25ccb3..4d80d556 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -199,22 +199,6 @@ MHD_DLOG (const struct MHD_Daemon *daemon,
           const char *format, ...);
 #endif
 
-/**
- * Process escape sequences ('+'=space, %HH) Updates val in place; the
- * result should be UTF-8 encoded and cannot be larger than the input.
- * The result must also still be 0-terminated.
- *
- * @param cls closure (use NULL)
- * @param connection handle to connection, not used
- * @param val value to unescape (modified in the process)
- * @return length of the resulting val (strlen(val) maybe
- *  shorter afterwards due to elimination of escape sequences)
- */
-size_t
-MHD_http_unescape (void *cls,
-                   struct MHD_Connection *connection,
-                   char *val);
-
 
 /**
  * Header or cookie in HTTP request or response.
diff --git a/src/microhttpd/postprocessor.c b/src/microhttpd/postprocessor.c
index 6512c603..95c7938f 100644
--- a/src/microhttpd/postprocessor.c
+++ b/src/microhttpd/postprocessor.c
@@ -382,7 +382,7 @@ post_process_urlencoded (struct MHD_PostProcessor *pp,
           buf[pp->buffer_pos] = '\0';   /* 0-terminate key */
           pp->buffer_pos = 0;   /* reset for next key */
           MHD_unescape_plus (buf);
-          MHD_http_unescape (NULL, NULL, buf);
+          MHD_http_unescape (buf);
           poff += equals + 1;
           pp->state = PP_ProcessValue;
           pp->value_offset = 0;
@@ -443,7 +443,7 @@ post_process_urlencoded (struct MHD_PostProcessor *pp,
           /* unescape */
           xbuf[xoff] = '\0';    /* 0-terminate in preparation */
           MHD_unescape_plus (xbuf);
-          xoff = MHD_http_unescape (NULL, NULL, xbuf);
+          xoff = MHD_http_unescape (xbuf);
           /* finally: call application! */
           pp->must_ikvi = MHD_NO;
           if (MHD_NO == pp->ikvi (pp->cls, MHD_POSTDATA_KIND, (const char *) &pp[1],    /* key */