[libmicrohttpd] branch master updated (ae6071dc -> 5eae5d9b)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from ae6071dc GnuTLS: correctly pass sockets on W32 x64
     new 73b03e90 https tests: simplified makefile
     new 9a6ebcd6 Workaround for old broken GnuTLS builds
     new 5eae5d9b https tests: mute compiler warning on old systems

The 3 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:
 configure.ac                                 | 31 ++++++++++++
 src/testcurl/https/Makefile.am               | 72 +++++++++-------------------
 src/testcurl/https/test_https_session_info.c |  1 +
 3 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9d628ee1..53657d89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,7 @@ AS_IF([test `uname -s` = "OS/390"],
 # Checks for programs.
 AC_PROG_AWK
 AC_PROG_GREP
+AC_PROG_FGREP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
@@ -814,6 +815,7 @@ AS_IF([test "x$USE_THREADS" = "xposix"],
    [AC_DEFINE([MHD_USE_W32_THREADS],[1],[define to use W32 threads])])])
 AM_CONDITIONAL([USE_POSIX_THREADS], [test "x$USE_THREADS" = "xposix"])
 AM_CONDITIONAL([USE_W32_THREADS], [test "x$USE_THREADS" = "xw32"])
+AM_CONDITIONAL([USE_THREADS], [test "x$USE_THREADS" != "xnone"])
 AM_CONDITIONAL([DISABLE_THREADS], [test "x$USE_THREADS" = "xnone"])
 AC_MSG_RESULT([$USE_THREADS])
 
@@ -2596,6 +2598,35 @@ AC_SUBST([GNUTLS_CFLAGS])
 AC_SUBST([GNUTLS_LDFLAGS])
 AC_SUBST([GNUTLS_LIBS])
 
+AS_VAR_IF([have_gnutls], ["yes"],
+  [
+    AC_CACHE_CHECK([for GnuTLS quirks], [mhd_cv_gnutls_mthread_broken],
+      [
+        mhd_cv_gnutls_mthread_broken="no"
+        AS_IF([test -r /etc/redhat-release],
+          [
+            AS_IF([$FGREP ' release 6.' /etc/redhat-release >/dev/null || 
$FGREP '(Santiago)' /etc/redhat-release >/dev/null],
+              [mhd_cv_gnutls_mthread_broken="found"],
+            )
+          ]
+        )
+        AS_VAR_IF([mhd_cv_gnutls_mthread_broken], ["no"],
+          [
+            AS_IF([command -v rpm >/dev/null],
+              [
+                AS_IF([test r`rpm -E '%{rhel} 2>/dev/null'` = "r6"],
+                  [mhd_cv_gnutls_mthread_broken="found"],
+                )
+              ]
+            )
+          ]
+        )
+      ]
+    )
+  ]
+)
+AM_CONDITIONAL([HAVE_GNUTLS_MTHREAD_BROKEN], [[test 
"x${mhd_cv_gnutls_mthread_broken}" = "xfound"]])
+
 # optional: HTTP Basic Auth support. Enabled by default
 AC_MSG_CHECKING([[whether to support HTTP basic authentication]])
 AC_ARG_ENABLE([bauth],
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index f00355bb..6c2134dc 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -7,6 +7,19 @@ if USE_COVERAGE
   AM_CFLAGS = --coverage
 endif
 
+.NOTPARALLEL:
+
+MHD_CPU_COUNT_DEF = -DMHD_CPU_COUNT=$(CPU_COUNT)
+
+AM_CPPFLAGS = \
+  -I$(top_srcdir)/src/include \
+  -I$(top_srcdir)/src/microhttpd \
+  $(LIBCURL_CPPFLAGS) $(MHD_TLS_LIB_CPPFLAGS)
+
+LDADD = \
+  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
+  $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
+
 if HAVE_GNUTLS_SNI
   TEST_HTTPS_SNI = test_https_sni
 endif
@@ -17,36 +30,28 @@ if HAVE_POSIX_THREADS
     test_https_get_parallel_threads
 endif
 
-.NOTPARALLEL:
-
-MHD_CPU_COUNT_DEF = -DMHD_CPU_COUNT=$(CPU_COUNT)
-
-AM_CPPFLAGS = \
-  -I$(top_srcdir)/src/include \
-  -I$(top_srcdir)/src/microhttpd \
-  $(LIBCURL_CPPFLAGS) $(MHD_TLS_LIB_CPPFLAGS)
-
 THREAD_ONLY_TESTS = \
   test_tls_options \
   test_tls_authentication \
   $(HTTPS_PARALLEL_TESTS) \
   $(TEST_HTTPS_SNI) \
   test_https_session_info \
-  test_https_time_out \
   test_https_multi_daemon \
   test_https_get \
   test_empty_response \
   test_https_get_iovec \
   $(EMPTY_ITEM)
 
+if !HAVE_GNUTLS_MTHREAD_BROKEN
+THREAD_ONLY_TESTS += \
+  test_https_time_out \
+  $(EMPTY_ITEM)
+endif
+
 check_PROGRAMS = \
   test_https_get_select
 
-if USE_POSIX_THREADS
-check_PROGRAMS += \
-  $(THREAD_ONLY_TESTS)
-endif
-if USE_W32_THREADS
+if USE_THREADS
 check_PROGRAMS += \
   $(THREAD_ONLY_TESTS)
 endif
@@ -56,7 +61,6 @@ EXTRA_DIST = \
   host1.crt host1.key \
   host2.crt host2.key
 
-
 TESTS = \
   $(check_PROGRAMS)
 
@@ -66,9 +70,6 @@ test_https_time_out_SOURCES = \
   tls_test_keys.h \
   tls_test_common.h \
   tls_test_common.c
-test_https_time_out_LDADD  = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
 
 test_tls_options_SOURCES = \
   test_tls_options.c \
@@ -76,9 +77,6 @@ test_tls_options_SOURCES = \
   tls_test_common.h \
   tls_test_common.c \
   curl_version_check.c
-test_tls_options_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
 
 test_https_get_parallel_SOURCES = \
   test_https_get_parallel.c \
@@ -90,17 +88,13 @@ test_https_get_parallel_CPPFLAGS = \
 test_https_get_parallel_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 test_https_get_parallel_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(PTHREAD_LIBS) $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ 
@LIBCURL@
+  $(PTHREAD_LIBS) $(LDADD)
 
 test_empty_response_SOURCES = \
   test_empty_response.c \
   tls_test_keys.h \
   tls_test_common.h \
   tls_test_common.c
-test_empty_response_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
 
 test_https_get_parallel_threads_SOURCES = \
   test_https_get_parallel_threads.c \
@@ -112,53 +106,37 @@ test_https_get_parallel_threads_CPPFLAGS = \
 test_https_get_parallel_threads_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 test_https_get_parallel_threads_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(PTHREAD_LIBS) $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ 
@LIBCURL@
+  $(PTHREAD_LIBS) $(LDADD)
 
 test_tls_authentication_SOURCES = \
   test_tls_authentication.c \
   tls_test_keys.h \
   tls_test_common.h \
   tls_test_common.c
-test_tls_authentication_LDADD  = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
 
 test_https_session_info_SOURCES = \
   test_https_session_info.c \
   tls_test_keys.h \
   tls_test_common.h \
   tls_test_common.c
-test_https_session_info_LDADD  = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
 
 test_https_multi_daemon_SOURCES = \
   test_https_multi_daemon.c \
   tls_test_keys.h \
   tls_test_common.h \
   tls_test_common.c
-test_https_multi_daemon_LDADD  = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
 
 test_https_get_SOURCES = \
   test_https_get.c \
   tls_test_keys.h \
   tls_test_common.h \
   tls_test_common.c
-test_https_get_LDADD  = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
 
 test_https_get_iovec_SOURCES = \
   test_https_get_iovec.c \
   tls_test_keys.h \
   tls_test_common.h \
   tls_test_common.c
-test_https_get_iovec_LDADD  = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
 
 if HAVE_GNUTLS_SNI
 test_https_sni_SOURCES = \
@@ -169,9 +147,6 @@ test_https_sni_SOURCES = \
 test_https_sni_CPPFLAGS = \
   $(AM_CPPFLAGS) \
   -DABS_SRCDIR=\"$(abs_srcdir)\"
-test_https_sni_LDADD  = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
 endif
 
 test_https_get_select_SOURCES = \
@@ -179,6 +154,3 @@ test_https_get_select_SOURCES = \
   tls_test_keys.h \
   tls_test_common.h \
   tls_test_common.c
-test_https_get_select_LDADD  = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
diff --git a/src/testcurl/https/test_https_session_info.c 
b/src/testcurl/https/test_https_session_info.c
index a329e02e..3a49ce60 100644
--- a/src/testcurl/https/test_https_session_info.c
+++ b/src/testcurl/https/test_https_session_info.c
@@ -231,6 +231,7 @@ main (int argc, char *const *argv)
   return errorCount != 0 ? 1 : 0;
 #else  /* LIBCURL_VERSION_NUM < 0x072200 */
   (void) argc; (void) argv;   /* Unused. Silent compiler warning. */
+  (void) query_session_ahc; /* Mute compiler warning */
   return 77;
 #endif /* LIBCURL_VERSION_NUM < 0x072200 */
 }

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