From 5782daed8f39ff7d973cfe804b5c04bb1ccf723e Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 4 Feb 2021 18:42:22 +0100
Subject: ensure ikvi callback returning MHD_NO terminates iteration

---
 ChangeLog                      |  4 ++++
 src/microhttpd/postprocessor.c | 52 +++---------------------------------------
 2 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ab2a5fa..bdbdc15c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu 04 Feb 2021 06:41:34 PM CET
+    Fix PostProcessor to always properly stop iteration when application callback
+    tells it to do so. -CG
+
 Wed 06 Jan 2021 08:39:58 PM CET
     Return timeout of zero also for connections awaiting cleanup. -CG
 
diff --git a/src/microhttpd/postprocessor.c b/src/microhttpd/postprocessor.c
index e6f0a9a7..aea78def 100644
--- a/src/microhttpd/postprocessor.c
+++ b/src/microhttpd/postprocessor.c
@@ -1,6 +1,6 @@
 /*
      This file is part of libmicrohttpd
-     Copyright (C) 2007-2013 Daniel Pittman and Christian Grothoff
+     Copyright (C) 2007-2021 Daniel Pittman and Christian Grothoff
 
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Lesser General Public
@@ -251,31 +251,6 @@ struct MHD_PostProcessor
 };
 
 
-/**
- * Create a `struct MHD_PostProcessor`.
- *
- * A `struct MHD_PostProcessor` can be used to (incrementally) parse
- * the data portion of a POST request.  Note that some buggy browsers
- * fail to set the encoding type.  If you want to support those, you
- * may have to call #MHD_set_connection_value with the proper encoding
- * type before creating a post processor (if no supported encoding
- * type is set, this function will fail).
- *
- * @param connection the connection on which the POST is
- *        happening (used to determine the POST format)
- * @param buffer_size maximum number of bytes to use for
- *        internal buffering (used only for the parsing,
- *        specifically the parsing of the keys).  A
- *        tiny value (256-1024) should be sufficient.
- *        Do NOT use a value smaller than 256.  For good
- *        performance, use 32 or 64k (i.e. 65536).
- * @param iter iterator to be called with the parsed data,
- *        Must NOT be NULL.
- * @param iter_cls first argument to @a iter
- * @return NULL on error (out of memory, unsupported encoding),
- *         otherwise a PP handle
- * @ingroup request
- */
 struct MHD_PostProcessor *
 MHD_create_post_processor (struct MHD_Connection *connection,
                            size_t buffer_size,
@@ -661,6 +636,8 @@ post_process_urlencoded (struct MHD_PostProcessor *pp,
                      start_value,
                      end_value,
                      NULL);
+      if (PP_Error == pp->state)
+        continue;
       pp->value_offset = 0;
       start_value = NULL;
       end_value = NULL;
@@ -1408,19 +1385,6 @@ END:
 }
 
 
-/**
- * Parse and process POST data.  Call this function when POST data is
- * available (usually during an #MHD_AccessHandlerCallback) with the
- * "upload_data" and "upload_data_size".  Whenever possible, this will
- * then cause calls to the #MHD_PostDataIterator.
- *
- * @param pp the post processor
- * @param post_data @a post_data_len bytes of POST data
- * @param post_data_len length of @a post_data
- * @return #MHD_YES on success, #MHD_NO on error
- *         (out-of-memory, iterator aborted, parse error)
- * @ingroup request
- */
 enum MHD_Result
 MHD_post_process (struct MHD_PostProcessor *pp,
                   const char *post_data,
@@ -1449,16 +1413,6 @@ MHD_post_process (struct MHD_PostProcessor *pp,
 }
 
 
-/**
- * Release PostProcessor resources.
- *
- * @param pp post processor context to destroy
- * @return #MHD_YES if processing completed nicely,
- *         #MHD_NO if there were spurious characters / formatting
- *                problems; it is common to ignore the return
- *                value of this function
- * @ingroup request
- */
 enum MHD_Result
 MHD_destroy_post_processor (struct MHD_PostProcessor *pp)
 {
-- 
cgit v1.2.3