[GNUnet-SVN] [libmicrohttpd] branch master updated (c6a73b72 -> 785ae52b)

[gnunet]

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

grothoff pushed a change to branch master
in repository libmicrohttpd.

    from c6a73b72 fix #5289 (ftbfs without https in src/lib/)
     new e7cad044 eliminate strcat()
     new 37b6d7a4 Fix make distcheck
     new f2bb6090 Add testcurl/https logs to artifacts
     new 785ae52b include headers in dist, but do not yet install those in the 
system (too early)

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:
 .gitlab-ci.yml               | 6 ++++--
 Makefile.am                  | 7 +++++--
 src/include/Makefile.am      | 1 +
 src/lib/Makefile.am          | 1 +
 src/testcurl/test_callback.c | 3 +--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc8f81ef..4d2d2032 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,8 @@ gcc/Stretch:
     when: on_failure
     paths:
       - ./*.log
-      - src/microhttpd/*.log
+      - src/*/*.log
+      - src/*/*/*.log
 
 # In this build we combine
 #  * clang
@@ -71,7 +72,8 @@ Sanitizers/Stretch:
     when: on_failure
     paths:
       - ./*.log
-      - src/microhttpd/*.log
+      - src/*/*.log
+      - src/*/*/*.log
 
 Scan-Build/Debian:
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_BUILD
diff --git a/Makefile.am b/Makefile.am
index b67b3cb3..ccef1999 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@ EXTRA_DIST = \
   libmicrohttpd.pc.in \
   $(EXTRA_PO_DIST) \
   $(W32COMMON) $(W32VS2013) $(W32VS2015) $(W32VS2017)
+DISTCLEANFILES=po/configargs.stamp
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libmicrohttpd.pc
@@ -107,7 +108,9 @@ $(srcdir_po)/POTFILES.in:
        @$(MAKE) $(AM_MAKEFLAGS) update-POTFILES.in
 
 update-POTFILES.in:
-       @$(am__cd) $(srcdir_po) && echo @ECHO_N@ "Creating po/POTFILES.in... 
@ECHO_C@" && chmod o+w . && \
+       @$(am__cd) $(srcdir_po) && if ! test -e POTFILES.in; then \
+         echo @ECHO_N@ "Creating po/POTFILES.in... @ECHO_C@" && chmod o+w . && 
\
          find '../src/include' ! -name 'include' -prune -name '*.h' ! -name 
'mhd_options.h' > POTFILES.in && \
          find '../src/microhttpd' ! -name 'microhttpd' -prune \( -name '*.h' 
-o -name '*.c' \) ! -name 'test_*' >> POTFILES.in && \
-         echo "@address@hidden" || (rm -f POTFILES.in ; echo "@address@hidden" 
&& false)
+         echo "@address@hidden" || (rm -f POTFILES.in ; echo "@address@hidden" 
&& false) \
+       fi
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index a2222a7c..29c91c98 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -2,5 +2,6 @@
 SUBDIRS = .
 
 include_HEADERS = microhttpd.h 
+noinst_HEADERS = microhttpd2.h microhttpd_tls.h
 
 EXTRA_DIST = platform.h autoinit_funcs.h mhd_options.h
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index ce4dd8d4..68104adf 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -104,6 +104,7 @@ libmicrohttpd2_la_SOURCES = \
   request.c \
   request_info.c \
   request_resume.c \
+  request_resume.h \
   sysfdsetsize.c sysfdsetsize.h \
   upgrade_process.c upgrade_process.h \
   panic.c \
diff --git a/src/testcurl/test_callback.c b/src/testcurl/test_callback.c
index 5b9daf0f..1c5e98d2 100644
--- a/src/testcurl/test_callback.c
+++ b/src/testcurl/test_callback.c
@@ -42,8 +42,7 @@ called_twice(void *cls, uint64_t pos, char *buf, size_t max)
 
   if (cls2->called == 0)
     {
-      memset(buf, 0, max);
-      strcat(buf, "test");
+      memcpy(buf, "test", 5);
       cls2->called = 1;
       return strlen(buf);
     }

-- 
To stop receiving notification emails like this one, please contact
address@hidden