Merge from MHD and update .travis.yml

Merge https://gnunet.org/git/libmicrohttpd

Author: maru

.gitignore

@@ -2,6 +2,7 @@ Makefile.in
 Makefile
 .deps
 .libs
+config.rpath
 /test-driver
 /INSTALL
 /libmicrohttpd.pc
@@ -43,3 +44,6 @@ po/configure.acT
 po/Makevars.template
 po/POTFILES
 po/configargs.stamp
+**~
+doc/libmicrohttpd.log
+src/examples/suspend_resume_epoll

.gitlab-ci.yml

@@ -0,0 +1,103 @@
+# we utilize the images generated by the build-images project, to
+# speed up CI runs. We also use ccache and store config.cache
+# to speed up compilation. We include a version number in cache
+# name to allow expiration of old caches.
+
+cache:
+  key: "$CI_JOB_NAME-ver1"
+  paths:
+    - cache/
+
+before_script:
+  # CCache Config
+  - mkdir -p cache
+  - export CCACHE_BASEDIR=${PWD}
+  - export CCACHE_DIR=${PWD}/cache
+  - export CC="ccache gcc"
+
+after_script:
+  # somehow after_script looses environment
+  - export CCACHE_BASEDIR=${PWD}
+  - export CCACHE_DIR=${PWD}/cache
+  - ccache -s
+
+variables:
+  BUILD_IMAGES_PROJECT: libmicrohttpd/build-images
+  DEBIAN_BUILD: buildenv-debian-stretch
+  MINGW_BUILD: buildenv-debian-mingw
+  GET_SOURCES_ATTEMPTS: "3"
+  CONFIGURE_BASE_FLAGS: --enable-asserts --cache-file cache/config.cache
+  CFLAGS_DEFAULT: -O0 -g -ggdb3
+
+# In this build we combine
+#  * gcc
+#  * check, distcheck
+gcc/Stretch:
+  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_BUILD
+  script:
+    - export CFLAGS=$CFLAGS_DEFAULT
+    - ./bootstrap
+    - ./configure $CONFIGURE_BASE_FLAGS
+    - make -j$(nproc)
+    - make -j$(nproc) check
+    - make -j$(nproc) distcheck
+  tags:
+    - shared
+  artifacts:
+    expire_in: 2 weeks
+    when: on_failure
+    paths:
+      - ./*.log
+      - src/*/*.log
+      - src/*/*/*.log
+
+# In this build we combine
+#  * clang
+#  * ASan, UBSan
+#  * check, distcheck
+Sanitizers/Stretch:
+  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_BUILD
+  script:
+    - export CFLAGS="$CFLAGS_DEFAULT -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=address"
+    - ./bootstrap
+    - export CC="ccache clang"
+    - export UBSAN_OPTIONS=print_stacktrace=1
+    - export ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-3.8/bin/llvm-symbolizer
+    - ./configure $CONFIGURE_BASE_FLAGS --disable-doc
+    - make -j$(nproc) check
+    - make -j$(nproc) distcheck
+  tags:
+    - shared
+  artifacts:
+    expire_in: 2 weeks
+    when: on_failure
+    paths:
+      - ./*.log
+      - src/*/*.log
+      - src/*/*/*.log
+
+Scan-Build/Debian:
+  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_BUILD
+  script:
+    - export CFLAGS=$CFLAGS_DEFAULT
+    - ./bootstrap
+    - scan-build ./configure $CONFIGURE_BASE_FLAGS
+    - scan-build -v -enable-checker security,nullability --status-bugs -o scan-build make -j$(nproc)
+    - scan-build -v -enable-checker security,nullability --status-bugs -o scan-build make -j$(nproc) check
+  tags:
+    - shared
+  except:
+    - tags
+  artifacts:
+    expire_in: 2 weeks
+    when: on_failure
+    paths:
+      - scan-build/*
+
+MinGW/Debian:
+  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$MINGW_BUILD
+  script:
+    - export CC="ccache $PREFIX-gcc"
+    - ./bootstrap
+    - ./configure $CONFIGURE_BASE_FLAGS --build=x86_64-pc-linux-gnu --host=$PREFIX
+    - make -j$(nproc)

.travis.yml

@@ -2,38 +2,29 @@ language: c
 compiler: gcc
 sudo: false
 env:
-  NGHTTP2_VERSION=1.24.0
-  CURL_VERSION=7.49.0
-  CURL_DIR=curl-${CURL_VERSION}
+  NGHTTP2_VERSION=1.31.0
+  CURL_VERSION=7.50.0
   PREFIX_DIR=/usr/local
 addons:
   apt:
     packages:
-      - texinfo
-      - libcunit1-dev
-      - libssl-dev
-      - libxml2-dev
-      - libev-dev
-      - libevent-dev
-      - libjansson-dev
-      - libjemalloc-dev
-      - libc-ares-dev
+      - autopoint
       - zzuf
       - socat
 install:
   - |
     cd ~/build/ &&
-    curl -L https://github.com/nghttp2/nghttp2/releases/download/v${NGHTTP2_VERSION}/nghttp2-${NGHTTP2_VERSION}.tar.gz |
-    tar xzf - &&
+    curl -L https://github.com/nghttp2/nghttp2/releases/download/v${NGHTTP2_VERSION}/nghttp2-${NGHTTP2_VERSION}.tar.xz |
+    tar Jxf - &&
     cd nghttp2-${NGHTTP2_VERSION} &&
     CXX="g++-4.8" ./configure --prefix=${PREFIX_DIR} --enable-lib-only &&
     make && sudo make install
   - |
     cd ~/build/ &&
     curl -L https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz |
-    tar xzf - &&
-    cd ${CURL_DIR} &&
-    CXX="g++-4.8" ./configure --prefix=${PREFIX_DIR} --with-nghttp2 --without-ssl --with-gnutls &&
+    tar zxf - &&
+    cd curl-${CURL_VERSION} &&
+    CXX="g++-4.8" ./configure --prefix=${PREFIX_DIR} --with-nghttp2=${PREFIX_DIR} --without-ssl --with-gnutls &&
     make && sudo make install
   - cd ~/build/maru/libmicrohttpd-http2/
 before_script:
@@ -45,7 +36,7 @@ script:
     echo '#undef HAVE_INET6' >> MHD_config.h &&
     make && make check
   - |
-    ./configure --prefix=${PREFIX_DIR} --enable-https --enable-http2 --with-nghttp2 --disable-doc --enable-silent-rules --enable-asserts &&
+    ./configure --prefix=${PREFIX_DIR} --enable-https --enable-http2 --with-nghttp2=${PREFIX_DIR} --disable-doc --enable-silent-rules --enable-asserts &&
     echo '#undef HAVE_INET6' >> MHD_config.h &&
     make && make check
 after_failure: