[libmicrohttpd] branch master updated (21b807ae -> 16ac89f3)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 21b807ae Added two tests for correct choice of "Keep-Alive" or "Close"
     new f30afba9 Simplified makefile for testcurl
     new 3fa1d302 Fixed: always close connection if "close" was requested by 
client
     new cc29f300 Fixed: do not enforce "close" connection if reply has no body 
and size is unknown
     new 16ac89f3 Fixed: avoid duplication of "close" token in replies

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/microhttpd/connection.c |  64 ++++++++-------
 src/testcurl/Makefile.am    | 195 +++++---------------------------------------
 2 files changed, 54 insertions(+), 205 deletions(-)

diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 83126b5d..b7505762 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -1182,6 +1182,11 @@ keepalive_possible (struct MHD_Connection *connection)
   if (! MHD_IS_HTTP_VER_SUPPORTED (connection->http_ver))
     return MHD_NO;
 
+  if (MHD_lookup_header_s_token_ci (connection,
+                                    MHD_HTTP_HEADER_CONNECTION,
+                                    "close"))
+    return MHD_NO;
+
   if (MHD_IS_HTTP_VER_1_1_COMPAT (connection->http_ver) &&
       ( (NULL == connection->response) ||
         (0 == (connection->response->flags
@@ -1192,11 +1197,6 @@ keepalive_possible (struct MHD_Connection *connection)
                                       "upgrade"))
       return MHD_NO;
 
-    if (MHD_lookup_header_s_token_ci (connection,
-                                      MHD_HTTP_HEADER_CONNECTION,
-                                      "close"))
-      return MHD_NO;
-
     return MHD_YES;
   }
   if (MHD_HTTP_VER_1_0 == connection->http_ver)
@@ -1617,31 +1617,33 @@ setup_reply_properties (struct MHD_Connection 
*connection)
   else
     c->rp_props.send_reply_body = false;
 
-  if ( (c->rp_props.use_reply_body_headers) &&
-       ((MHD_SIZE_UNKNOWN == r->total_size) ||
-        (0 != (r->flags_auto & MHD_RAF_HAS_TRANS_ENC_CHUNKED))) )
-  { /* Chunked reply encoding is needed if possible */
-
-    /* Check whether chunked encoding is supported by the client */
-    if (! MHD_IS_HTTP_VER_1_1_COMPAT (c->http_ver))
-      use_chunked = false;
-    /* Check whether chunked encoding is allowed for the reply */
-    else if (0 != (r->flags & (MHD_RF_HTTP_VERSION_1_0_ONLY
-                               | MHD_RF_HTTP_VERSION_1_0_RESPONSE)))
-      use_chunked = false;
-    /* TODO: Use chunked for HTTP/1.1 non-Keep-Alive */
-    else if (0 != (r->flags_auto & MHD_RAF_HAS_TRANS_ENC_CHUNKED))
-      use_chunked = true;
-    else if (! use_keepalive)
-      use_chunked = false;
+  if (c->rp_props.use_reply_body_headers)
+  {
+    if ((MHD_SIZE_UNKNOWN == r->total_size) ||
+        (0 != (r->flags_auto & MHD_RAF_HAS_TRANS_ENC_CHUNKED)))
+    { /* Chunked reply encoding is needed if possible */
+
+      /* Check whether chunked encoding is supported by the client */
+      if (! MHD_IS_HTTP_VER_1_1_COMPAT (c->http_ver))
+        use_chunked = false;
+      /* Check whether chunked encoding is allowed for the reply */
+      else if (0 != (r->flags & (MHD_RF_HTTP_VERSION_1_0_ONLY
+                                 | MHD_RF_HTTP_VERSION_1_0_RESPONSE)))
+        use_chunked = false;
+      /* TODO: Use chunked for HTTP/1.1 non-Keep-Alive */
+      else if (0 != (r->flags_auto & MHD_RAF_HAS_TRANS_ENC_CHUNKED))
+        use_chunked = true;
+      else if (! use_keepalive)
+        use_chunked = false;
+      else
+        use_chunked = true;
+    }
     else
-      use_chunked = true;
-  }
-  else
-    use_chunked = false;
+      use_chunked = false;
 
-  if ( (MHD_SIZE_UNKNOWN == r->total_size) && ! use_chunked)
-    use_keepalive = false; /* End of the stream is indicated by closure */
+    if ( (MHD_SIZE_UNKNOWN == r->total_size) && ! use_chunked)
+      use_keepalive = false; /* End of the stream is indicated by closure */
+  }
 
   c->rp_props.chunked = use_chunked;
   c->rp_props.set = true;
@@ -1703,7 +1705,9 @@ buffer_append (char *buf,
  * @param kind the kind of objects (headers or footers)
  * @param filter_transf_enc skip "Transfer-Encoding" header
  * @param add_close add "close" token to the
- *                  "Connection:" header (if any)
+ *                  "Connection:" header (if any), ignored if no "Connection:"
+ *                  header was added by user or if "close" token is already
+ *                  present in "Connection:" header
  * @param add_keep_alive add "Keep-Alive" token to the
  *                       "Connection:" header (if any)
  * @return true if succeed,
@@ -1735,6 +1739,8 @@ add_user_headers (char *buf,
     add_close = false;          /* No such header */
     add_keep_alive = false;     /* No such header */
   }
+  else if (0 != (r->flags_auto & MHD_RAF_HAS_CONNECTION_CLOSE))
+    add_close = false;          /* "close" token was already set */
 
   for (hdr = r->first_header; NULL != hdr; hdr = hdr->next)
   {
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index 3912c716..2a6f58cb 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -18,6 +18,9 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/include \
 $(LIBCURL_CPPFLAGS)
 
+LDADD = \
+  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
+  @LIBCURL@
 
 THREAD_ONLY_TESTS = \
   test_urlparse \
@@ -165,43 +168,31 @@ test_concurrent_stop_SOURCES = \
 test_concurrent_stop_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 test_concurrent_stop_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(PTHREAD_LIBS) @LIBCURL@
+  $(PTHREAD_LIBS) $(LDADD)
 
 test_get_SOURCES = \
   test_get.c
-test_get_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_quiesce_SOURCES = \
   test_quiesce.c
 test_quiesce_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 test_quiesce_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(PTHREAD_LIBS) @LIBCURL@
+  $(PTHREAD_LIBS) $(LDADD)
 
 test_quiesce_stream_SOURCES = \
   test_quiesce_stream.c
 test_quiesce_stream_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 test_quiesce_stream_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(PTHREAD_LIBS) @LIBCURL@
+  $(PTHREAD_LIBS) $(LDADD)
 
 test_callback_SOURCES = \
   test_callback.c
-test_callback_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 perf_get_SOURCES = \
   perf_get.c \
   gauger.h mhd_has_in_name.h
-perf_get_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 perf_get_concurrent_SOURCES = \
   perf_get_concurrent.c \
@@ -209,8 +200,7 @@ perf_get_concurrent_SOURCES = \
 perf_get_concurrent_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 perf_get_concurrent_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(PTHREAD_LIBS) @LIBCURL@
+  $(PTHREAD_LIBS) $(LDADD)
 
 perf_get_concurrent11_SOURCES = \
   perf_get_concurrent.c \
@@ -218,38 +208,28 @@ perf_get_concurrent11_SOURCES = \
 perf_get_concurrent11_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 perf_get_concurrent11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(PTHREAD_LIBS) @LIBCURL@
+  $(PTHREAD_LIBS) $(LDADD)
 
 test_digestauth_SOURCES = \
   test_digestauth.c
 test_digestauth_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBGCRYPT_LIBS@ @LIBCURL@
+  @LIBGCRYPT_LIBS@ $(LDADD)
 
 test_digestauth_sha256_SOURCES = \
   test_digestauth_sha256.c
 test_digestauth_sha256_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBGCRYPT_LIBS@ @LIBCURL@
+  @LIBGCRYPT_LIBS@ $(LDADD)
 
 test_digestauth_with_arguments_SOURCES = \
   test_digestauth_with_arguments.c
 test_digestauth_with_arguments_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBGCRYPT_LIBS@ @LIBCURL@
+  @LIBGCRYPT_LIBS@ $(LDADD)
 
 test_get_iovec_SOURCES = \
   test_get_iovec.c mhd_has_in_name.h
-test_get_iovec_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_sendfile_SOURCES = \
   test_get_sendfile.c mhd_has_in_name.h
-test_get_sendfile_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_wait_SOURCES = \
   test_get_wait.c \
@@ -257,8 +237,7 @@ test_get_wait_SOURCES = \
 test_get_wait_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 test_get_wait_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(PTHREAD_LIBS) @LIBCURL@
+  $(PTHREAD_LIBS) $(LDADD)
 
 test_get_wait11_SOURCES = \
   test_get_wait.c \
@@ -266,14 +245,10 @@ test_get_wait11_SOURCES = \
 test_get_wait11_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 test_get_wait11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(PTHREAD_LIBS) @LIBCURL@
+  $(PTHREAD_LIBS) $(LDADD)
 
 test_urlparse_SOURCES = \
   test_urlparse.c mhd_has_in_name.h
-test_urlparse_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_response_cleanup_SOURCES = \
   test_get_response_cleanup.c mhd_has_in_name.h
@@ -282,296 +257,164 @@ test_get_response_cleanup_LDADD = \
 
 test_get_chunked_SOURCES = \
   test_get_chunked.c
-test_get_chunked_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_chunked_close_SOURCES = \
   test_get_chunked.c
-test_get_chunked_close_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_chunked_string_SOURCES = \
   test_get_chunked.c
-test_get_chunked_string_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_chunked_close_string_SOURCES = \
   test_get_chunked.c
-test_get_chunked_close_string_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_chunked_empty_SOURCES = \
   test_get_chunked.c
-test_get_chunked_empty_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_chunked_close_empty_SOURCES = \
   test_get_chunked.c
-test_get_chunked_close_empty_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_chunked_string_empty_SOURCES = \
   test_get_chunked.c
-test_get_chunked_string_empty_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_chunked_close_string_empty_SOURCES = \
   test_get_chunked.c
-test_get_chunked_close_string_empty_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_chunked_sized_SOURCES = \
   test_get_chunked.c
-test_get_chunked_sized_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_chunked_close_sized_SOURCES = \
   test_get_chunked.c
-test_get_chunked_close_sized_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_chunked_empty_sized_SOURCES = \
   test_get_chunked.c
-test_get_chunked_empty_sized_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_chunked_close_empty_sized_SOURCES = \
   test_get_chunked.c
-test_get_chunked_close_empty_sized_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_chunked_forced_SOURCES = \
   test_get_chunked.c
-test_get_chunked_forced_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_chunked_empty_forced_SOURCES = \
   test_get_chunked.c
-test_get_chunked_empty_forced_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_post_SOURCES = \
   test_post.c mhd_has_in_name.h
-test_post_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_process_headers_SOURCES = \
   test_process_headers.c mhd_has_in_name.h
-test_process_headers_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_parse_cookies_SOURCES = \
   test_parse_cookies.c mhd_has_in_name.h
-test_parse_cookies_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_process_arguments_SOURCES = \
   test_process_arguments.c mhd_has_in_name.h
-test_process_arguments_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_postform_SOURCES = \
   test_postform.c mhd_has_in_name.h
 test_postform_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBGCRYPT_LIBS@ @LIBCURL@
+  @LIBGCRYPT_LIBS@ $(LDADD)
 
 test_post_loop_SOURCES = \
   test_post_loop.c mhd_has_in_name.h
-test_post_loop_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_delete_SOURCES = \
   test_delete.c mhd_has_in_name.h
-test_delete_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_patch_SOURCES = \
   test_patch.c mhd_has_in_name.h
-test_patch_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_patch11_SOURCES = \
   test_patch.c mhd_has_in_name.h
-test_patch11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_put_SOURCES = \
   test_put.c mhd_has_in_name.h
-test_put_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_put_chunked_SOURCES = \
   test_put_chunked.c
-test_put_chunked_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_add_conn_SOURCES = \
   test_add_conn.c $(top_srcdir)/src/microhttpd/test_helpers.h
 test_add_conn_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 test_add_conn_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
+  $(PTHREAD_LIBS) $(LDADD)
 
 test_add_conn_nolisten_SOURCES = \
   test_add_conn.c $(top_srcdir)/src/microhttpd/test_helpers.h
 test_add_conn_nolisten_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 test_add_conn_nolisten_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
+  $(PTHREAD_LIBS) $(LDADD)
 
 test_add_conn_cleanup_SOURCES = \
   test_add_conn.c $(top_srcdir)/src/microhttpd/test_helpers.h
 test_add_conn_cleanup_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 test_add_conn_cleanup_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
+  $(PTHREAD_LIBS) $(LDADD)
 
 test_add_conn_cleanup_nolisten_SOURCES = \
   test_add_conn.c $(top_srcdir)/src/microhttpd/test_helpers.h
 test_add_conn_cleanup_nolisten_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 test_add_conn_cleanup_nolisten_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
+  $(PTHREAD_LIBS) $(LDADD)
 
 test_get11_SOURCES = \
   test_get.c
-test_get11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_iovec11_SOURCES = \
   test_get_iovec.c mhd_has_in_name.h
-test_get_iovec11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_sendfile11_SOURCES = \
   test_get_sendfile.c mhd_has_in_name.h
-test_get_sendfile11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_close_SOURCES = \
   test_get_close_keep_alive.c $(top_srcdir)/src/microhttpd/test_helpers.h
-test_get_close_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_close10_SOURCES = \
   test_get_close_keep_alive.c $(top_srcdir)/src/microhttpd/test_helpers.h
-test_get_close10_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_keep_alive_SOURCES = \
   test_get_close_keep_alive.c $(top_srcdir)/src/microhttpd/test_helpers.h
-test_get_keep_alive_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_get_keep_alive10_SOURCES = \
   test_get_close_keep_alive.c $(top_srcdir)/src/microhttpd/test_helpers.h
-test_get_keep_alive10_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_post11_SOURCES = \
   test_post.c mhd_has_in_name.h
-test_post11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_postform11_SOURCES = \
   test_postform.c mhd_has_in_name.h
 test_postform11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBGCRYPT_LIBS@ @LIBCURL@
+  @LIBGCRYPT_LIBS@ $(LDADD)
 
 test_post_loop11_SOURCES = \
   test_post_loop.c mhd_has_in_name.h
-test_post_loop11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_put11_SOURCES = \
   test_put.c mhd_has_in_name.h
-test_put11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_large_put_SOURCES = \
   test_large_put.c
-test_large_put_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_large_put11_SOURCES = \
   test_large_put.c
-test_large_put11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_large_put_inc11_SOURCES = \
   test_large_put.c
-test_large_put_inc11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_long_header_SOURCES = \
   test_long_header.c mhd_has_in_name.h
-test_long_header_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_long_header11_SOURCES = \
   test_long_header.c mhd_has_in_name.h
-test_long_header11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_iplimit11_SOURCES = \
   test_iplimit.c mhd_has_in_name.h
-test_iplimit11_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_termination_SOURCES = \
   test_termination.c
-test_termination_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@
 
 test_timeout_SOURCES = \
   test_timeout.c mhd_has_in_name.h
-test_timeout_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.